diff options
author | Mattes D <github@xoft.cz> | 2014-06-29 00:46:11 +0200 |
---|---|---|
committer | Mattes D <github@xoft.cz> | 2014-06-29 00:46:11 +0200 |
commit | 1b89b997ffb81c38dbe27bc8719efb59a38e14a0 (patch) | |
tree | eee8b1ce2cc05d7eea2d5e54fd3c3e33a8daf953 /src/CMakeLists.txt | |
parent | Likely fixed too quick food depletion (diff) | |
parent | Fixed a silly path error in #include. (diff) | |
download | cuberite-1b89b997ffb81c38dbe27bc8719efb59a38e14a0.tar cuberite-1b89b997ffb81c38dbe27bc8719efb59a38e14a0.tar.gz cuberite-1b89b997ffb81c38dbe27bc8719efb59a38e14a0.tar.bz2 cuberite-1b89b997ffb81c38dbe27bc8719efb59a38e14a0.tar.lz cuberite-1b89b997ffb81c38dbe27bc8719efb59a38e14a0.tar.xz cuberite-1b89b997ffb81c38dbe27bc8719efb59a38e14a0.tar.zst cuberite-1b89b997ffb81c38dbe27bc8719efb59a38e14a0.zip |
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r-- | src/CMakeLists.txt | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 335ce8315..2f4d6ea13 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,9 +1,9 @@ cmake_minimum_required (VERSION 2.8.2) project (MCServer) -include_directories (SYSTEM "${PROJECT_SOURCE_DIR}/../lib/") -include_directories (SYSTEM "${PROJECT_SOURCE_DIR}/../lib/jsoncpp/include") -include_directories (SYSTEM "${PROJECT_SOURCE_DIR}/../lib/polarssl/include") +include_directories (SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/../lib/") +include_directories (SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/../lib/jsoncpp/include") +include_directories (SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/../lib/polarssl/include") set(FOLDERS OSSupport HTTPServer Items Blocks Protocol Generating PolarSSL++) set(FOLDERS ${FOLDERS} WorldStorage Mobs Entities Simulator UI BlockEntities Generating/Prefabs) @@ -119,7 +119,8 @@ if (NOT MSVC) # lib dependencies are not included - + include_directories ("${CMAKE_CURRENT_SOURCE_DIR}/../lib/polarssl/include") + #add cpp files here add_library(Bindings Bindings/Bindings @@ -134,7 +135,7 @@ if (NOT MSVC) Bindings/WebPlugin ) - target_link_libraries(Bindings lua sqlite tolualib) + target_link_libraries(Bindings lua sqlite tolualib polarssl) #clear file file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/BindingDependecies.txt) @@ -260,4 +261,4 @@ endif () if (WIN32) target_link_libraries(${EXECUTABLE} expat tolualib ws2_32.lib Psapi.lib) endif() -target_link_libraries(${EXECUTABLE} md5 luaexpat iniFile jsoncpp polarssl zlib lua sqlite) +target_link_libraries(${EXECUTABLE} luaexpat iniFile jsoncpp polarssl zlib lua sqlite) |