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

- fixed cmake build file to no longer look for libircclient

Browse Source
This commit is contained in:
Mark Vejvoda
2010-12-29 01:15:27 +00:00
parent 6e88e4be4c
commit 9442c22dc3
1 changed files with 1 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/glest_game/CMakeLists.txt
View File

@@ -6,8 +6,7 @@ SET(EXTERNAL_LIBS "")
IF(WIN32) IF(WIN32)
SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH}
${PROJECT_SOURCE_DIR}/source/win32_deps/lib ${PROJECT_SOURCE_DIR}/source/win32_deps/lib
${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib ${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib)
${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/build/lib)
INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/include) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/include)
INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/openal-soft-1.12.854/include) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/source/win32_deps/openal-soft-1.12.854/include)
@@ -25,31 +24,6 @@ IF(WIN32)
link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib) link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/xerces-c-src_2_8_0/lib)
ENDIF() ENDIF()
# stupid hack because cmake WILL NOT find libircclient for some reason
if(WIN32)
if(EXISTS ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/include/libircclient.h)
set(LIBIRCCLIENT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/include)
link_directories(${PROJECT_SOURCE_DIR}/source/win32_deps/libircclient/build/lib)
endif()
else()
#CHECK_INCLUDE_FILES(libircclient/libircclient.h LIBIRCCLIENT_INCLUDE_DIR)
FIND_PATH(LIBIRCCLIENT_INCLUDE_DIR NAME libircclient/libircclient.h PATHS /usr/local/include)
link_directories(/usr/local/include)
link_directories(/usr/local/lib)
endif()
#check_include_files("libircclient/libircclient.h;libircclient/include/libircclient.h" LIBIRCCLIENT_H_)
if(NOT LIBIRCCLIENT_INCLUDE_DIR)
message(FATAL_ERROR "missing libircclient : please install it [${LIBIRCCLIENT_INCLUDE_DIR}]")
endif()
INCLUDE_DIRECTORIES(${LIBIRCCLIENT_INCLUDE_DIR})
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})
IF(UNIX) IF(UNIX)