diff options
| author | LePresidente <brian.alexander.munro@gmail.com> | 2018-03-11 16:21:06 +0200 |
|---|---|---|
| committer | LePresidente <brian.alexander.munro@gmail.com> | 2018-03-11 16:24:12 +0200 |
| commit | 9ee2831c59c379e01bd73ced25ce02270dba48df (patch) | |
| tree | 6940151d9dabdb60298f1fdb946787eb29ddd649 /src | |
| parent | 12161d68fb1b63fc2f3ac1a33c405f0f36203cde (diff) | |
Fix library include for zlibstatic
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c94aa689..60b36683 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -277,6 +277,7 @@ SET(default_project_path "${CMAKE_SOURCE_DIR}/..") GET_FILENAME_COMPONENT(${default_project_path} ${default_project_path} REALPATH) SET(project_path "${default_project_path}" CACHE PATH "path to the other mo projects") +#TODO this should not be a hardcoded path SET(lib_path "${project_path}/../../install/libs") @@ -289,11 +290,9 @@ INCLUDE_DIRECTORIES(${project_path}/uibase/src ${project_path}/game_features/src ${project_path}/githubpp/src) - INCLUDE_DIRECTORIES(shared ${ZLIB_INCLUDE_DIRS}) LINK_DIRECTORIES(${lib_path} - ${project_path}/../zlib/lib) - + ${ZLIB_ROOT}/lib) EXECUTE_PROCESS( COMMAND git log -1 --format=%h WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} |