Changeset 2621 for code/branches/buildsystem2/src/orxonox/CMakeLists.txt

Timestamp:

Jan 29, 2009, 11:35:54 PM (15 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

File:

• code/branches/buildsystem2/src/orxonox/CMakeLists.txt (modified) (3 diffs)

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

@@ -1 @@
-ADD_SOURCE_FILES(
+SET_SOURCE_FILES(ORXONOX_SRC_FILES
   CameraManager.cc
   GraphicsEngine.cc
@@ -7 +7 @@
   Settings.cc
 )
+ADD_SUBDIRECTORY(gamestates)
+ADD_SUBDIRECTORY(gui)
+ADD_SUBDIRECTORY(objects)
+ADD_SUBDIRECTORY(overlays)
+ADD_SUBDIRECTORY(tools)
+GET_ALL_HEADER_FILES(ORXONOX_HDR_FILES)
+SET(ORXONOX_FILES ${ORXONOX_SRC_FILES} ${ORXONOX_HDR_FILES})
 
-ADD_SOURCE_DIRECTORY(gamestates)
-ADD_SOURCE_DIRECTORY(gui)
-ADD_SOURCE_DIRECTORY(objects)
-ADD_SOURCE_DIRECTORY(overlays)
-ADD_SOURCE_DIRECTORY(tools)
-
-WRITE_SOURCE_FILES(ORXONOX_SRC_FILES)
-
-TOLUA(Orxonox ORXONOX_SRC_FILES INPUTFILES gui/GUIManager.h)
+GENERATE_SOURCE_GROUPS(${ORXONOX_FILES})
+GENERATE_TOLUA_BINDINGS(Orxonox ORXONOX_FILES INPUTFILES gui/GUIManager.h)
 
 # Not using precompiled header files: Avoid dependencies
 INCLUDE_DIRECTORIES(pch/nopch)
 
-# Enlarge heap size for precompiled header files
-ADD_CXX_FLAGS("-Zm200" MSVC)
-
-ADD_EXECUTABLE(orxonox ${ORXONOX_SRC_FILES})
+ADD_EXECUTABLE(orxonox ${ORXONOX_FILES})
 GET_TARGET_PROPERTY(_exec_loc orxonox LOCATION)
 GET_FILENAME_COMPONENT(_exec_name ${_exec_loc} NAME)
@@ -44 +41 @@
   ${CEGUI_LIBRARY}
   ${LUA_LIBRARIES}
-  #${CEGUI_SCRIPT_LIBRARIES}
-  ceguilua_orxonox
+  ${CEGUILUA_LIBRARY}
   ogreceguirenderer_orxonox
-  tinyxml_orxonox
-  tolualib_orxonox
+  tinyxml++_orxonox
+  tolua++_orxonox
   util
   core