Changeset 2640 for code/branches/buildsystem2/cmake

Timestamp:

Feb 8, 2009, 10:02:58 PM (16 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.

Location:

code/branches/buildsystem2/cmake

Files:

• BuildConfigGCC.cmake (modified) (1 diff)
• GenerateToluaBindings.cmake (modified) (1 diff)

code/branches/buildsystem2/cmake/BuildConfigGCC.cmake

@@ -36 +36 @@
 INCLUDE(CompareVersionStrings)
 COMPARE_VERSION_STRINGS("${GCC_VERSION}" "4.0.0" _compare_result)
-IF(NOT _compare_result LESS 0)
-  SET(GCC_SYSTEM_HEADER_SUPPORT TRUE)
+IF(_compare_result LESS 0)
+  SET(GCC_NO_SYSTEM_HEADER_SUPPORT)
 ENDIF()
 

code/branches/buildsystem2/cmake/GenerateToluaBindings.cmake

@@ -38 +38 @@
 
   SET(_tolua_pkgfile "${CMAKE_CURRENT_BINARY_DIR}/tolua.pkg")
-  SET(_tolua_cxxfile "${CMAKE_CURRENT_BINARY_DIR}/ToluaBind${_tolua_package}.cc")
-  SET(_tolua_hfile   "${CMAKE_CURRENT_BINARY_DIR}/ToluaBind${_tolua_package}.h")
+  SET(_tolua_cxxfile "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/ToluaBind${_tolua_package}.cc")
+  SET(_tolua_hfile   "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/ToluaBind${_tolua_package}.h")
 
   SET(${_target_source_files}