Changeset 2640 for code/branches/buildsystem2/src/CMakeLists.txt

Timestamp:

Feb 8, 2009, 10:02:58 PM (15 years ago)

Author:

rgrieder

Message:

• Corrected version info
• Bugfix: GCC 3 warning workaround was active for other compilers than GCC
• Bugfix: Tolua bind files for debug and release configurations had the same path in MSVC. Using separate paths now to avoid reompiling when changing the configuration.

File:

• code/branches/buildsystem2/src/CMakeLists.txt (modified) (1 diff)

code/branches/buildsystem2/src/CMakeLists.txt

@@ -93 +93 @@
   ${ZLIB_INCLUDE_DIR}
 
-  # Internal
-  .
-  orxonox
-  # Required for tolua bind and config files that are in the binary folder
+  # All library includes are prefixed with the path to avoid conflicts
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  # Convenience directory
+  ${CMAKE_CURRENT_SOURCE_DIR}/orxonox
+  # OrxonoxConfig.h
   ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_CURRENT_BINARY_DIR}/orxonox
+  # Tolua bind files for Core
+  ${CMAKE_CURRENT_BINARY_DIR}/core/${CMAKE_CFG_INTDIR}
+  # Tolua bind files for Orxonox
+  ${CMAKE_CURRENT_BINARY_DIR}/orxonox/${CMAKE_CFG_INTDIR}
 )