Changeset 3167 for code/branches/pch/src/CMakeLists.txt

Timestamp:

Jun 14, 2009, 6:11:32 PM (16 years ago)

Author:

rgrieder

Message:

Merged the build system changes from the Gruppenarbeit:

• More Comments (including Doxygen stuff for the config files)
• Removed redundancy between PackageConfigMSVC.cmake and PackageConfigMinGW.cmake
• Option ORXONOX_RELEASE which activates some expensive (build time) optimisations
• Native Visual Leak Detector support (doesn't work for MSVC9 though)
• Added CMake option to disable the console on Windows

File:

• code/branches/pch/src/CMakeLists.txt (modified) (4 diffs)

code/branches/pch/src/CMakeLists.txt

@@ -29 +29 @@
 ADD_COMPILER_FLAGS("-DOIS_DYNAMIC_LIB")
 # Tolua binding speedup if required
-ADD_COMPILER_FLAGS("-DTOLUA_RELEASE" Release MinSizeRel TOLUA_PARSER_RELEASE)
+ADD_COMPILER_FLAGS("-DTOLUA_RELEASE" ORXONOX_RELEASE)
 
 # Default linking is SHARED
@@ -77 +77 @@
 
 SET(GENERATED_FILE_COMMENT
-   "DO NOT EDIT THIS FILE!
+   "DO NOT EDIT THIS FILE! <br>
     It has been automatically generated by CMake from OrxonoxConfig.h.in")
 # Copy and configure OrxonoxConfig which gets included in every file
@@ -108 +108 @@
   ${DIRECTX_INCLUDE_DIR}
   ${ZLIB_INCLUDE_DIR}
+  ${VLD_INCLUDE_DIR}
 
   # All library includes are prefixed with the path to avoid conflicts
@@ -152 +153 @@
 ADD_SUBDIRECTORY(network)
 ADD_SUBDIRECTORY(orxonox)
-
-# Apply version info
-SET_TARGET_PROPERTIES(util core network orxonox
-  PROPERTIES VERSION ${ORXONOX_VERSION})