flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

COnverted ProtoProxy to use library CMakeLists

Browse Source
This commit is contained in:
Tycho 2014-02-16 04:09:00 -08:00
parent 2acf218700
commit 83f0438e21
2 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tools/MCADefrag/CMakeLists.txt
View File

@ -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()

21
Tools/ProtoProxy/CMakeLists.txt
View File

@ -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)