mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-22 16:02:50 +02:00
Code Issues Projects Releases Wiki Activity

- updates to cmake for libircclient

Browse Source
This commit is contained in:
Mark Vejvoda
2010-12-23 06:56:19 +00:00
parent bafc574143
commit 1d4de5e423
5 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/configurator/CMakeLists.txt
View File

@@ -55,23 +55,20 @@ ENDIF()
# stupid hack because cmake WILL NOT find libircclient for some reason # stupid hack because cmake WILL NOT find libircclient for some reason
if(WIN32) if(WIN32)
if(EXISTS ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/include/libircclient.h) if(EXISTS ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/include/libircclient.h)
set(LIBIRCCLIENT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/include) set(LIBIRCCLIENT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/include)
link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/build/lib) link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/build/lib)
endif() endif()
else() else()
#CHECK_INCLUDE_FILES(libircclient.h LIBIRCCLIENT_INCLUDE_DIR) FIND_PATH(LIBIRCCLIENT_INCLUDE_DIR NAME libircclient/libircclient.h PATHS /usr/local/include)
FIND_PATH(LIBIRCCLIENT_INCLUDE_DIR NAME libircclient.h) link_directories(/usr/local/include)
link_directories(/usr/local/lib)
endif() endif()
#check_include_files("libircclient/libircclient.h;libircclient/include/libircclient.h" LIBIRCCLIENT_H_)
if(NOT LIBIRCCLIENT_INCLUDE_DIR) if(NOT LIBIRCCLIENT_INCLUDE_DIR)
message(FATAL_ERROR "missing libircclient : please install it [${LIBIRCCLIENT_INCLUDE_DIR}] [${CMAKE_FIND_ROOT_PATH}]") message(FATAL_ERROR "missing libircclient : please install it [${LIBIRCCLIENT_INCLUDE_DIR}]")
endif() endif()
INCLUDE_DIRECTORIES(${LIBIRCCLIENT_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${LIBIRCCLIENT_INCLUDE_DIR})
#SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ircclient)
######################################################################################### #########################################################################################
# glest configurator # glest configurator

16
source/g3d_viewer/CMakeLists.txt
View File

@@ -55,24 +55,20 @@ ENDIF()
# stupid hack because cmake WILL NOT find libircclient for some reason # stupid hack because cmake WILL NOT find libircclient for some reason
if(WIN32) if(WIN32)
if(EXISTS ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/include/libircclient.h) if(EXISTS ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/include/libircclient.h)
set(LIBIRCCLIENT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/include) set(LIBIRCCLIENT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/include)
link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/build/lib) link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/build/lib)
endif() endif()
else() else()
#CHECK_INCLUDE_FILES(libircclient.h LIBIRCCLIENT_INCLUDE_DIR) FIND_PATH(LIBIRCCLIENT_INCLUDE_DIR NAME libircclient/libircclient.h PATHS /usr/local/include)
FIND_PATH(LIBIRCCLIENT_INCLUDE_DIR NAME libircclient.h) link_directories(/usr/local/include)
link_directories(/usr/local/lib)
endif() endif()
#check_include_files("libircclient/libircclient.h;libircclient/include/libircclient.h" LIBIRCCLIENT_H_)
if(NOT LIBIRCCLIENT_INCLUDE_DIR) if(NOT LIBIRCCLIENT_INCLUDE_DIR)
message(FATAL_ERROR "missing libircclient : please install it [${LIBIRCCLIENT_INCLUDE_DIR}] [${CMAKE_FIND_ROOT_PATH}]") message(FATAL_ERROR "missing libircclient : please install it [${LIBIRCCLIENT_INCLUDE_DIR}]")
endif() endif()
INCLUDE_DIRECTORIES(${LIBIRCCLIENT_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${LIBIRCCLIENT_INCLUDE_DIR})
#SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ircclient)
######################################################################################### #########################################################################################
# glest G3d Model Viewer # glest G3d Model Viewer

8
source/glest_game/CMakeLists.txt
View File

@@ -36,15 +36,19 @@ else()
#CHECK_INCLUDE_FILES(libircclient/libircclient.h LIBIRCCLIENT_INCLUDE_DIR) #CHECK_INCLUDE_FILES(libircclient/libircclient.h LIBIRCCLIENT_INCLUDE_DIR)
FIND_PATH(LIBIRCCLIENT_INCLUDE_DIR NAME libircclient/libircclient.h PATHS /usr/local/include) FIND_PATH(LIBIRCCLIENT_INCLUDE_DIR NAME libircclient/libircclient.h PATHS /usr/local/include)
link_directories(/usr/local/include) link_directories(/usr/local/include)
link_directories(/usr/local/lib/libircclient) link_directories(/usr/local/lib)
endif() endif()
#check_include_files("libircclient/libircclient.h;libircclient/include/libircclient.h" LIBIRCCLIENT_H_) #check_include_files("libircclient/libircclient.h;libircclient/include/libircclient.h" LIBIRCCLIENT_H_)
if(NOT LIBIRCCLIENT_INCLUDE_DIR) if(NOT LIBIRCCLIENT_INCLUDE_DIR)
message(FATAL_ERROR "missing libircclient : please install it [${LIBIRCCLIENT_INCLUDE_DIR}]") message(FATAL_ERROR "missing libircclient : please install it [${LIBIRCCLIENT_INCLUDE_DIR}]")
endif() endif()
INCLUDE_DIRECTORIES(${LIBIRCCLIENT_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${LIBIRCCLIENT_INCLUDE_DIR})
SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ircclient)
if(NOT WIN32)
SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ircclient)
ENDIF()
FIND_PACKAGE(SDL REQUIRED) FIND_PACKAGE(SDL REQUIRED)
INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})

16
source/glest_map_editor/CMakeLists.txt
View File

@@ -51,24 +51,20 @@ ENDIF()
# stupid hack because cmake WILL NOT find libircclient for some reason # stupid hack because cmake WILL NOT find libircclient for some reason
if(WIN32) if(WIN32)
if(EXISTS ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/include/libircclient.h) if(EXISTS ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/include/libircclient.h)
set(LIBIRCCLIENT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/include) set(LIBIRCCLIENT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/include)
link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/build/lib) link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/build/lib)
endif() endif()
else() else()
#CHECK_INCLUDE_FILES(libircclient.h LIBIRCCLIENT_INCLUDE_DIR) FIND_PATH(LIBIRCCLIENT_INCLUDE_DIR NAME libircclient/libircclient.h PATHS /usr/local/include)
FIND_PATH(LIBIRCCLIENT_INCLUDE_DIR NAME libircclient.h) link_directories(/usr/local/include)
link_directories(/usr/local/lib)
endif() endif()
#check_include_files("libircclient/libircclient.h;libircclient/include/libircclient.h" LIBIRCCLIENT_H_)
if(NOT LIBIRCCLIENT_INCLUDE_DIR) if(NOT LIBIRCCLIENT_INCLUDE_DIR)
message(FATAL_ERROR "missing libircclient : please install it [${LIBIRCCLIENT_INCLUDE_DIR}] [${CMAKE_FIND_ROOT_PATH}]") message(FATAL_ERROR "missing libircclient : please install it [${LIBIRCCLIENT_INCLUDE_DIR}]")
endif() endif()
INCLUDE_DIRECTORIES(${LIBIRCCLIENT_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${LIBIRCCLIENT_INCLUDE_DIR})
#SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ircclient)
######################################################################################### #########################################################################################
# glest map editor # glest map editor

4
source/shared_lib/CMakeLists.txt
View File

@@ -51,7 +51,7 @@ else()
#CHECK_INCLUDE_FILES(libircclient/libircclient.h LIBIRCCLIENT_INCLUDE_DIR) #CHECK_INCLUDE_FILES(libircclient/libircclient.h LIBIRCCLIENT_INCLUDE_DIR)
FIND_PATH(LIBIRCCLIENT_INCLUDE_DIR NAME libircclient/libircclient.h PATHS /usr/local/include) FIND_PATH(LIBIRCCLIENT_INCLUDE_DIR NAME libircclient/libircclient.h PATHS /usr/local/include)
link_directories(/usr/local/include) link_directories(/usr/local/include)
link_directories(/usr/local/lib/libircclient) link_directories(/usr/local/lib)
endif() endif()
#check_include_files("libircclient/libircclient.h;libircclient/include/libircclient.h" LIBIRCCLIENT_H_) #check_include_files("libircclient/libircclient.h;libircclient/include/libircclient.h" LIBIRCCLIENT_H_)
@@ -59,7 +59,7 @@ if(NOT LIBIRCCLIENT_INCLUDE_DIR)
message(FATAL_ERROR "missing libircclient : please install it [${LIBIRCCLIENT_INCLUDE_DIR}]") message(FATAL_ERROR "missing libircclient : please install it [${LIBIRCCLIENT_INCLUDE_DIR}]")
endif() endif()
INCLUDE_DIRECTORIES(${LIBIRCCLIENT_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${LIBIRCCLIENT_INCLUDE_DIR})
SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ircclient) #SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ircclient)
FIND_PACKAGE(SDL REQUIRED) FIND_PACKAGE(SDL REQUIRED)
INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})