diff options
| author | Mattes D <github@xoft.cz> | 2014-02-16 15:56:50 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-02-16 15:56:50 +0100 |
| commit | 2a78ecf97efb925afd53071f0d887a69df000ade (patch) | |
| tree | de1dbd50090f4835c5e80cd8bf0a33c9e7087782 /lib | |
| parent | Merge pull request #686 from Howaner/GlobalFixes (diff) | |
| parent | Fixed comment (diff) | |
| download | cuberite-2a78ecf97efb925afd53071f0d887a69df000ade.tar cuberite-2a78ecf97efb925afd53071f0d887a69df000ade.tar.gz cuberite-2a78ecf97efb925afd53071f0d887a69df000ade.tar.bz2 cuberite-2a78ecf97efb925afd53071f0d887a69df000ade.tar.lz cuberite-2a78ecf97efb925afd53071f0d887a69df000ade.tar.xz cuberite-2a78ecf97efb925afd53071f0d887a69df000ade.tar.zst cuberite-2a78ecf97efb925afd53071f0d887a69df000ade.zip | |
Diffstat (limited to '')
| -rw-r--r-- | lib/polarssl.cmake | 5 | ||||
| -rw-r--r-- | lib/tolua++/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lib/zlib/CMakeLists.txt | 14 |
3 files changed, 14 insertions, 7 deletions
diff --git a/lib/polarssl.cmake b/lib/polarssl.cmake new file mode 100644 index 000000000..d57cc9220 --- /dev/null +++ b/lib/polarssl.cmake @@ -0,0 +1,5 @@ + +if(NOT TARGET polarssl) + message("including polarssl") + add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/polarssl/ ${CMAKE_CURRENT_BINARY_DIR}/lib/polarssl EXCLUDE_FROM_ALL ) +endif() diff --git a/lib/tolua++/CMakeLists.txt b/lib/tolua++/CMakeLists.txt index 239232c38..5ec8ee822 100644 --- a/lib/tolua++/CMakeLists.txt +++ b/lib/tolua++/CMakeLists.txt @@ -19,7 +19,7 @@ add_library(tolualib ${LIB_SOURCE}) #m is the standard math librarys if(UNIX) -target_link_libraries(tolua m) +target_link_libraries(tolua m ${DYNAMIC_LOADER}) endif() target_link_libraries(tolua lua tolualib) diff --git a/lib/zlib/CMakeLists.txt b/lib/zlib/CMakeLists.txt index b1b74031d..6c52578ee 100644 --- a/lib/zlib/CMakeLists.txt +++ b/lib/zlib/CMakeLists.txt @@ -8,12 +8,14 @@ file(GLOB SOURCE "*.c" ) -add_library(zlib ${SOURCE}) +if(NOT TARGET zlib) + add_library(zlib ${SOURCE}) -if (MSVC) - # Remove SCL warnings, we expect this library to have been tested safe - SET_TARGET_PROPERTIES( - zlib PROPERTIES COMPILE_FLAGS "-D_CRT_SECURE_NO_WARNINGS" - ) + if (MSVC) + # Remove SCL warnings, we expect this library to have been tested safe + SET_TARGET_PROPERTIES( + zlib PROPERTIES COMPILE_FLAGS "-D_CRT_SECURE_NO_WARNINGS" + ) + endif() endif() |