[Orxonox-commit 228] r2888 - in branches/ggz: . cmake

[adrfried at orxonox.net]

Author: adrfried
Date: 2009-04-02 18:36:19 +0200 (Thu, 02 Apr 2009)
New Revision: 2888

Modified:
   branches/ggz/CMakeLists.txt
   branches/ggz/cmake/BuildConfigGCC.cmake
Log:
cmake install prefix reset, compiler flags fixed

Modified: branches/ggz/CMakeLists.txt
===================================================================
--- branches/ggz/CMakeLists.txt	2009-04-02 15:03:16 UTC (rev 2887)
+++ branches/ggz/CMakeLists.txt	2009-04-02 16:36:19 UTC (rev 2888)
@@ -41,7 +41,6 @@
 
 IF(UNIX AND NOT APPLE)
   INCLUDE(FlagUtilities)
-  SET_CACHE(CMAKE_INSTALL_PREFIX PATH "" /usr) # default: /usr/local
 ENDIF()
 
 # Library finding

Modified: branches/ggz/cmake/BuildConfigGCC.cmake
===================================================================
--- branches/ggz/cmake/BuildConfigGCC.cmake	2009-04-02 15:03:16 UTC (rev 2887)
+++ branches/ggz/cmake/BuildConfigGCC.cmake	2009-04-02 16:36:19 UTC (rev 2888)
@@ -64,10 +64,9 @@
 
 # Increase warning level if requested
 IF(EXTRA_COMPILER_WARNINGS)
-  REMOVE_COMPILER_FLAGS("-Wall" CACHE)
-  ADD_COMPILER_FLAGS("-Wextra --Wno-unused-parameter" CACHE)
+  ADD_COMPILER_FLAGS("-Wall -Wextra -Wno-unused-parameter" CACHE)
 ELSE()
-  REMOVE_COMPILER_FLAGS("-Wextra --Wno-unused-parameter" CACHE)
+  REMOVE_COMPILER_FLAGS("-Wextra -Wno-unused-parameter" CACHE)
   ADD_COMPILER_FLAGS("-Wall" CACHE)
 ENDIF()