diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-02-16 13:09:00 +0100 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-02-16 13:09:00 +0100 |
| commit | 83f0438e21676a0b97850c9c974d3b1a57fc573c (patch) | |
| tree | 4b21a2ab2004d18aaf39c969e424d2cd7cc49c6f | |
| parent | Allow building MCADefrag at the same time as MCServer (diff) | |
| download | cuberite-83f0438e21676a0b97850c9c974d3b1a57fc573c.tar cuberite-83f0438e21676a0b97850c9c974d3b1a57fc573c.tar.gz cuberite-83f0438e21676a0b97850c9c974d3b1a57fc573c.tar.bz2 cuberite-83f0438e21676a0b97850c9c974d3b1a57fc573c.tar.lz cuberite-83f0438e21676a0b97850c9c974d3b1a57fc573c.tar.xz cuberite-83f0438e21676a0b97850c9c974d3b1a57fc573c.tar.zst cuberite-83f0438e21676a0b97850c9c974d3b1a57fc573c.zip | |
| -rw-r--r-- | Tools/MCADefrag/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tools/ProtoProxy/CMakeLists.txt | 21 |
2 files changed, 5 insertions, 18 deletions
diff --git a/Tools/MCADefrag/CMakeLists.txt b/Tools/MCADefrag/CMakeLists.txt index c11c8c772..2a021049f 100644 --- a/Tools/MCADefrag/CMakeLists.txt +++ b/Tools/MCADefrag/CMakeLists.txt @@ -31,7 +31,7 @@ endfunction() # Include the libraries: -add_subdirectory(../../lib/zlib lib/zlib) +add_subdirectory(../../lib/zlib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/lib/zlib) set_exe_flags() diff --git a/Tools/ProtoProxy/CMakeLists.txt b/Tools/ProtoProxy/CMakeLists.txt index 9e233a688..30630b04b 100644 --- a/Tools/ProtoProxy/CMakeLists.txt +++ b/Tools/ProtoProxy/CMakeLists.txt @@ -77,19 +77,8 @@ function(flatten_files arg1) set(${arg1} "${res}" PARENT_SCOPE) endfunction() - -# Include the libraries: -file(GLOB POLARSSL_SRC "../../lib/polarssl/library/*.c") -file(GLOB POLARSSL_HDR "../../lib/polarssl/include/polarssl/*.h") -flatten_files(POLARSSL_SRC) -flatten_files(POLARSSL_HDR) -source_group("PolarSSL" FILES ${POLARSSL_SRC} ${POLARSSL_HDR}) - -file(GLOB ZLIB_SRC "../../lib/zlib/*.c") -file(GLOB ZLIB_HDR "../../lib/zlib/*.h") -flatten_files(ZLIB_SRC) -flatten_files(ZLIB_HDR) -source_group("ZLib" FILES ${ZLIB_SRC} ${ZLIB_HDR}) +include(../../lib/polarssl.cmake) +add_subdirectory(../../lib/zlib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/lib/zlib) # Include the shared files: @@ -149,9 +138,7 @@ add_executable(ProtoProxy ${SHARED_HDR} ${SHARED_OSS_SRC} ${SHARED_OSS_HDR} - ${POLARSSL_SRC} - ${POLARSSL_HDR} - ${ZLIB_SRC} - ${ZLIB_HDR} ) +target_link_libraries(ProtoProxy zlib polarssl) + |