summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-07-19 00:27:50 +0200
committerarchshift <admin@archshift.com>2014-07-19 02:41:44 +0200
commit832530469360020d5cc1bd0a4142c3450d4cd8f9 (patch)
tree8cf0ce142eefb80c443db87e4461f5e347d37557
parentsrc/CMakeLists.txt: Replaced glob with list of files (diff)
downloadcuberite-832530469360020d5cc1bd0a4142c3450d4cd8f9.tar
cuberite-832530469360020d5cc1bd0a4142c3450d4cd8f9.tar.gz
cuberite-832530469360020d5cc1bd0a4142c3450d4cd8f9.tar.bz2
cuberite-832530469360020d5cc1bd0a4142c3450d4cd8f9.tar.lz
cuberite-832530469360020d5cc1bd0a4142c3450d4cd8f9.tar.xz
cuberite-832530469360020d5cc1bd0a4142c3450d4cd8f9.tar.zst
cuberite-832530469360020d5cc1bd0a4142c3450d4cd8f9.zip
Diffstat (limited to '')
-rw-r--r--src/Bindings/CMakeLists.txt6
-rw-r--r--src/CMakeLists.txt29
2 files changed, 12 insertions, 23 deletions
diff --git a/src/Bindings/CMakeLists.txt b/src/Bindings/CMakeLists.txt
index fd6223469..da6a6919a 100644
--- a/src/Bindings/CMakeLists.txt
+++ b/src/Bindings/CMakeLists.txt
@@ -30,3 +30,9 @@ SET (HDRS
WebPlugin.h
tolua++.h
)
+
+if(NOT MSVC)
+ add_library(Bindings ${SRCS} ${HDRS})
+
+ target_link_libraries(Bindings lua sqlite tolualib polarssl)
+endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dc6fec02f..afe766f13 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,7 +6,7 @@ include_directories (SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/../lib/jsoncpp/include"
include_directories (SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/../lib/polarssl/include")
set(FOLDERS
- OSSupport HTTPServer Items Blocks Protocol Generating PolarSSL++
+ OSSupport HTTPServer Items Blocks Protocol Generating PolarSSL++ Bindings
WorldStorage Mobs Entities Simulator UI BlockEntities Generating/Prefabs
)
@@ -250,26 +250,14 @@ 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")
- #add cpp files here
- add_library(Bindings
- Bindings/Bindings
- Bindings/DeprecatedBindings
- Bindings/LuaChunkStay
- Bindings/LuaState
- Bindings/LuaWindow
- Bindings/ManualBindings
- Bindings/Plugin
- Bindings/PluginLua
- Bindings/PluginManager
- Bindings/WebPlugin
- )
+ include_directories ("${CMAKE_CURRENT_SOURCE_DIR}/../lib/polarssl/include")
- target_link_libraries(Bindings lua sqlite tolualib polarssl)
+ foreach(folder ${FOLDERS})
+ add_subdirectory(${folder})
+ endforeach(folder)
#clear file
file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/BindingDependecies.txt)
@@ -280,10 +268,6 @@ 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}")
@@ -299,7 +283,6 @@ else ()
source_group(Bindings FILES "Bindings/Bindings.cpp" "Bindings/Bindings.h")
# Add all subfolders as solution-folders:
- list(APPEND FOLDERS "Bindings")
function(includefolder PATH)
FILE(GLOB FOLDER_FILES
"${PATH}/*.cpp"