summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-02-16 13:30:45 +0100
committerTycho <work.tycho+git@gmail.com>2014-02-16 13:30:45 +0100
commitf42ad4e9f7e06a95ce1f5a9b3f7ae0246f81e6d5 (patch)
tree9729478516e08d313f0ad316f5722f0b24b72801
parentNow uses setflags for flags (diff)
downloadcuberite-f42ad4e9f7e06a95ce1f5a9b3f7ae0246f81e6d5.tar
cuberite-f42ad4e9f7e06a95ce1f5a9b3f7ae0246f81e6d5.tar.gz
cuberite-f42ad4e9f7e06a95ce1f5a9b3f7ae0246f81e6d5.tar.bz2
cuberite-f42ad4e9f7e06a95ce1f5a9b3f7ae0246f81e6d5.tar.lz
cuberite-f42ad4e9f7e06a95ce1f5a9b3f7ae0246f81e6d5.tar.xz
cuberite-f42ad4e9f7e06a95ce1f5a9b3f7ae0246f81e6d5.tar.zst
cuberite-f42ad4e9f7e06a95ce1f5a9b3f7ae0246f81e6d5.zip
-rw-r--r--CMakeLists.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c8daf915..18d1fc1c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,7 @@ enable_language(CXX C)
#THis has to be done before any flags have been set up.
if(${BUILD_TOOLS})
add_subdirectory(Tools/MCADefrag/)
+ add_subdirectory(Tools/ProtoProxy/)
endif()
if(${BUILD_UNSTABLE_TOOLS})
@@ -51,7 +52,7 @@ add_subdirectory(lib/md5/)
# We use EXCLUDE_FROM_ALL so that only the explicit dependencies are used
# (PolarSSL also has test and example programs in their CMakeLists.txt, we don't want those)
-add_subdirectory(lib/polarssl/ EXCLUDE_FROM_ALL)
+include(lib/polarssl.cmake)
set_exe_flags()