Changeset 2593

Timestamp:

Jan 12, 2009, 7:06:54 PM (16 years ago)

Author:

rgrieder

Message:

CMake sometimes has very strange behaviour… Fixed another bug int FindOGRE.cmake

Location:

code/branches/buildsystem2

Files:

• cmake/FindOGRE.cmake (modified) (1 diff)
• src/CMakeLists.txt (modified) (1 diff)

code/branches/buildsystem2/cmake/FindOGRE.cmake

@@ -78 +78 @@
         # If debug version is not available, release will do as well
         IF(NOT OGRE_PLUGIN_${_plugin}_DEBUG)
-            SET(OGRE_PLUGIN_${_plugin}_DEBUG ${OGRE_PLUGIN_${_plugin}_OPTIMIZED} CACHE STRING "")
+            SET(OGRE_PLUGIN_${_plugin}_DEBUG ${OGRE_PLUGIN_${_plugin}_OPTIMIZED} CACHE STRING "" FORCE)
         ENDIF(NOT OGRE_PLUGIN_${_plugin}_DEBUG)
         MARK_AS_ADVANCED(OGRE_PLUGIN_${_plugin}_OPTIMIZED OGRE_PLUGIN_${_plugin}_DEBUG)

code/branches/buildsystem2/src/CMakeLists.txt

@@ -37 +37 @@
 
 # Set special macro symbols across all libraries
-ADD_CXX_FLAGS("-DTIXML_USE_TICPP" "TRUE")
-ADD_C_FLAGS  ("-DTIXML_USE_TICPP" "TRUE")
+ADD_CXX_FLAGS("-DTIXML_USE_TICPP" 1)
+ADD_C_FLAGS  ("-DTIXML_USE_TICPP" 1)
 
 # Include macros