[Orxonox-commit 420] r3002 - in branches/ggz: cmake src

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-05-20 22:45:36 +0200 (Wed, 20 May 2009)
New Revision: 3002

Modified:
   branches/ggz/cmake/LibraryConfig.cmake
   branches/ggz/src/CMakeLists.txt
Log:
Possible build bug: in the compiler config files (BuildConfig, etc.) the compiler flags get reset at first. Adding flags before that will have no effect.

Modified: branches/ggz/cmake/LibraryConfig.cmake
===================================================================
--- branches/ggz/cmake/LibraryConfig.cmake	2009-05-20 19:01:17 UTC (rev 3001)
+++ branches/ggz/cmake/LibraryConfig.cmake	2009-05-20 20:45:36 UTC (rev 3002)
@@ -115,10 +115,8 @@
 FIND_PACKAGE(ALUT            REQUIRED)
 FIND_PACKAGE(ZLIB            REQUIRED)
 FIND_PACKAGE(GGZ                     )
-IF(GGZMOD_FOUND)
-	ADD_COMPILER_FLAGS("-DHAS_GGZ")
-ELSE(GGZMOD_FOUND)
-	MESSAGE("GGZMOD not found, disabling GGZ support")
+IF(NOT GGZMOD_FOUND)
+  MESSAGE("GGZMOD not found, disabling GGZ support")
 ENDIF(GGZMOD_FOUND)
 IF(WIN32)
   FIND_PACKAGE(DirectX       REQUIRED)

Modified: branches/ggz/src/CMakeLists.txt
===================================================================
--- branches/ggz/src/CMakeLists.txt	2009-05-20 19:01:17 UTC (rev 3001)
+++ branches/ggz/src/CMakeLists.txt	2009-05-20 20:45:36 UTC (rev 3002)
@@ -31,6 +31,10 @@
 ADD_COMPILER_FLAGS("-DOIS_DYNAMIC_LIB")
 # Tolua binding speedup if required
 ADD_COMPILER_FLAGS("-DTOLUA_RELEASE" Release MinSizeRel TOLUA_PARSER_RELEASE)
+# Enable GGZMode support if found
+IF(GGZMODE_FOUND)
+  ADD_COMPILER_FLAGS("-DHAS_GGZ")
+ENDIF()
 
 ################ OrxonoxConfig.h ################