Changeset 2907 for code/branches/questsystem5/cmake

Timestamp:

Apr 8, 2009, 12:36:08 AM (16 years ago)

Author:

dafrick

Message:

Merging of the current QuestSystem branch.

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• cmake/BuildConfig.cmake (modified) (1 diff)
• cmake/BuildConfigGCC.cmake (modified) (1 diff)
• cmake/FindDirectX.cmake (modified) (1 prop)
• cmake/FlagUtilities.cmake (modified) (2 diffs)
• cmake/LibraryConfigTardis.cmake (modified) (1 prop)

code/branches/questsystem5/cmake/BuildConfig.cmake

@@ -90 +90 @@
 ################ Compiler Config ################
 
-OPTION(EXTRA_COMPILER_WARNINGS "Enable some extra warnings (heavily pollutes the output)")
+OPTION(EXTRA_COMPILER_WARNINGS "Enable some extra warnings (heavily pollutes the output)" FALSE)
 
 INCLUDE(FlagUtilities)

code/branches/questsystem5/cmake/BuildConfigGCC.cmake

@@ -63 +63 @@
 ADD_COMPILER_FLAGS("-Wno-sign-compare" GCC_NO_SYSTEM_HEADER_SUPPORT CACHE)
 
+# For newer GCC (4.3 and above), don't display hundreds of annoying deprecated
+# messages. Other versions don't seem to show any such warnings at all.
+ADD_COMPILER_FLAGS("-Wno-deprecated" CXX)
+
 # 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()

code/branches/questsystem5/cmake/FlagUtilities.cmake

@@ -54 +54 @@
 ENDMACRO(SET_CACHE)
 
+# Visual studio (esp. IntelliSense) doesn't like dashes to specify arguments
+# Always use foward slashes instead
+IF(MSVC)
+  SET(ARGUMENT_STARTER "/")
+ELSE()
+  SET(ARGUMENT_STARTER "-")
+ENDIF(MSVC)
+
 # Separates a string of flags. " -" or " /" denotes the start of a flag.
 # The same sequence inside double quotation marks is ignored.
@@ -71 +79 @@
     # Extract one flag if possible
     SET(_flag)
-    STRING(REGEX REPLACE "^.* [/-](.+)( [/-].*$)" "-\\1" _flag "${_flag_string}")
+    STRING(REGEX REPLACE "^.* [/-](.+)( [/-].*$)" "${ARGUMENT_STARTER}\\1" _flag "${_flag_string}")
     STRING(REGEX REPLACE "^.* [/-](.+)( [/-].*$)" "\\2"  _flag_string "${_flag_string}")
     IF(NOT _flag STREQUAL _flag_string)