[Orxonox-commit 197] r2868 - in trunk: . cmake

[adrfried at orxonox.net]

Author: adrfried
Date: 2009-03-30 21:26:14 +0000 (Mon, 30 Mar 2009)
New Revision: 2868

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

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2009-03-30 19:31:00 UTC (rev 2867)
+++ trunk/CMakeLists.txt	2009-03-30 21:26:14 UTC (rev 2868)
@@ -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: trunk/cmake/BuildConfigGCC.cmake
===================================================================
--- trunk/cmake/BuildConfigGCC.cmake	2009-03-30 19:31:00 UTC (rev 2867)
+++ trunk/cmake/BuildConfigGCC.cmake	2009-03-30 21:26:14 UTC (rev 2868)
@@ -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()