Changeset 2621 for code/branches/buildsystem2/src/core

Timestamp:

Jan 29, 2009, 11:35:54 PM (16 years ago)

Author:

rgrieder

Message:

This commit gets a little ugly, couldn't separate that anymore:

• Renamed UseTolua.cmake to GenerateLuaBindings.cmake
• Applied the macros for compiler flags, linker flags, header files and source groups Updated the whole build tree for that
• Created real compiler config scripts (BuildConfigGCC.cmake and BuildConfigMSVC.cmake)
• Large scale clean up in BuildConfig.cmake
• You can now specify your own LibraryConfig and BuildConfig script via CMake Cache
• Lots of small changes and fixes

Location:

code/branches/buildsystem2/src/core

Files:

• CMakeLists.txt (modified) (3 diffs)
• input/CMakeLists.txt (modified) (1 diff)

code/branches/buildsystem2/src/core/CMakeLists.txt

@@ -1 @@
-ADD_SOURCE_FILES(
+SET_SOURCE_FILES(CORE_SRC_FILES
   Clock.cc
   ConfigFileManager.cc
@@ -42 +42 @@
   TclThreadManager.cc
 )
+ADD_SUBDIRECTORY(input)
+GET_ALL_HEADER_FILES(CORE_HDR_FILES)
+SET(CORE_FILES ${CORE_SRC_FILES} ${CORE_HDR_FILES})
 
-ADD_SOURCE_DIRECTORY(input)
+GENERATE_SOURCE_GROUPS(${CORE_FILES})
+GENERATE_TOLUA_BINDINGS(Core CORE_FILES INPUTFILES LuaBind.h CommandExecutor.h)
 
-WRITE_SOURCE_FILES(CORE_SRC_FILES)
-
-TOLUA(Core CORE_SRC_FILES INPUTFILES LuaBind.h CommandExecutor.h)
-
-ADD_LIBRARY(core SHARED ${CORE_SRC_FILES})
+ADD_LIBRARY(core SHARED ${CORE_FILES})
 
 SET_TARGET_PROPERTIES(core PROPERTIES DEFINE_SYMBOL "CORE_SHARED_BUILD")
@@ -59 +59 @@
   cpptcl_orxonox
   ois_orxonox
-  tinyxml_orxonox
-  tolualib_orxonox
+  tinyxml++_orxonox
+  tolua++_orxonox
   util
 )

code/branches/buildsystem2/src/core/input/CMakeLists.txt

@@ -1 @@
-ADD_SOURCE_FILES(
+ADD_SOURCE_FILES(CORE_SRC_FILES
   Button.cc
   CalibratorCallback.cc