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

Fixed multiple mbedtls inclusion.

Browse Source 
Ref.: #1880.
This commit is contained in:
Mattes D 2015-05-03 10:01:19 +02:00
parent e6eeee84e0
commit 2f369d09b6
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -54,11 +54,13 @@ endif()
# This has to be done before any flags have been set up. # This has to be done before any flags have been set up.
if(${BUILD_TOOLS}) if(${BUILD_TOOLS})
message("Building tools")
add_subdirectory(Tools/MCADefrag/) add_subdirectory(Tools/MCADefrag/)
add_subdirectory(Tools/ProtoProxy/) add_subdirectory(Tools/ProtoProxy/)
endif() endif()
if(${BUILD_UNSTABLE_TOOLS}) if(${BUILD_UNSTABLE_TOOLS})
message("Building unstable tools")
add_subdirectory(Tools/GeneratorPerformanceTest/) add_subdirectory(Tools/GeneratorPerformanceTest/)
endif() endif()

11
lib/polarssl.cmake
View File

@ -1,11 +1,10 @@
if(NOT TARGET polarssl) # This script includes PolarSSL, if not already included.
# It is needed for when multiple projects reference PolarSSL.
if(NOT TARGET mbedtls)
message("including polarssl") message("including polarssl")
set(ENABLE_TESTING OFF CACHE BOOL "Disable tests") set(ENABLE_TESTING OFF CACHE BOOL "Disable tests")
set(ENABLE_PROGRAMS OFF CACHE BOOL "Disable programs") set(ENABLE_PROGRAMS OFF CACHE BOOL "Disable programs")
if (SELF_TEST) add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/polarssl/ ${CMAKE_CURRENT_BINARY_DIR}/lib/polarssl EXCLUDE_FROM_ALL)
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/polarssl/ ${CMAKE_CURRENT_BINARY_DIR}/lib/polarssl)
else()
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/polarssl/ ${CMAKE_CURRENT_BINARY_DIR}/lib/polarssl EXCLUDE_FROM_ALL)
endif()
endif() endif()