From bafc5741432320aa5b1d31ed901b14d08cf88af2 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Thu, 23 Dec 2010 02:24:46 +0000 Subject: [PATCH] - added custom path for titi's old Ubuntu --- source/glest_game/CMakeLists.txt | 6 ++++-- source/shared_lib/CMakeLists.txt | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt index 775947554..e825f7bd5 100644 --- a/source/glest_game/CMakeLists.txt +++ b/source/glest_game/CMakeLists.txt @@ -33,8 +33,10 @@ if(WIN32) 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) + #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/libircclient) endif() #check_include_files("libircclient/libircclient.h;libircclient/include/libircclient.h" LIBIRCCLIENT_H_) diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt index e9ae817e4..d996e63d4 100644 --- a/source/shared_lib/CMakeLists.txt +++ b/source/shared_lib/CMakeLists.txt @@ -48,8 +48,10 @@ if(WIN32) 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) + #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/libircclient) endif() #check_include_files("libircclient/libircclient.h;libircclient/include/libircclient.h" LIBIRCCLIENT_H_)