summaryrefslogtreecommitdiffstats
path: root/src/CMakeLists.txt
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-07-19 00:41:42 +0200
committerarchshift <admin@archshift.com>2014-07-19 02:41:44 +0200
commit3d368b015e2032f86130b8a3f4d05ca72287c63a (patch)
treee58daa92b76c0a0d239184495679de4617970fd3 /src/CMakeLists.txt
parentCMake: Add Bindings library from subdirectory (diff)
downloadcuberite-3d368b015e2032f86130b8a3f4d05ca72287c63a.tar
cuberite-3d368b015e2032f86130b8a3f4d05ca72287c63a.tar.gz
cuberite-3d368b015e2032f86130b8a3f4d05ca72287c63a.tar.bz2
cuberite-3d368b015e2032f86130b8a3f4d05ca72287c63a.tar.lz
cuberite-3d368b015e2032f86130b8a3f4d05ca72287c63a.tar.xz
cuberite-3d368b015e2032f86130b8a3f4d05ca72287c63a.tar.zst
cuberite-3d368b015e2032f86130b8a3f4d05ca72287c63a.zip
Diffstat (limited to '')
-rw-r--r--src/CMakeLists.txt13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index afe766f13..2fe436125 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -248,17 +248,10 @@ set_source_files_properties(Bindings/Bindings.cpp PROPERTIES GENERATED TRUE)
set_source_files_properties(Bindings/Bindings.h PROPERTIES GENERATED TRUE)
if (NOT MSVC)
-
# Bindings need to reference other folders, so they are done here instead
-
# lib dependencies are not included
-
include_directories ("${CMAKE_CURRENT_SOURCE_DIR}/../lib/polarssl/include")
- foreach(folder ${FOLDERS})
- add_subdirectory(${folder})
- endforeach(folder)
-
#clear file
file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/BindingDependecies.txt)
foreach(dependecy ${BINDING_DEPENDECIES})
@@ -268,6 +261,10 @@ if (NOT MSVC)
set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "Bindings.cpp Bindings.h")
+ foreach(folder ${FOLDERS})
+ add_subdirectory(${folder})
+ endforeach(folder)
+
list(APPEND SOURCE "${SRCS}")
list(APPEND SOURCE "${HDRS}")
@@ -275,8 +272,6 @@ if (NOT MSVC)
if (WIN32)
list(APPEND SOURCE "Resources/MCServer.rc")
endif()
-
-
else ()
# MSVC-specific handling: Put all files into one project, separate by the folders: