Changeset 5872

Timestamp:

Oct 4, 2009, 7:27:35 PM (15 years ago)

Author:

rgrieder

Message:

Removing redundancy: Specifying ORXONOX_EXTERAL for a target should already suppress all warnings.

Location:

code/branches/core5

Files:

• cmake/ParseMacroArguments.cmake (modified) (1 diff)
• cmake/TargetUtilities.cmake (modified) (3 diffs)
• src/external/bullet/CMakeLists.txt (modified) (1 diff)
• src/external/ceguilua/CMakeLists.txt (modified) (1 diff)
• src/external/cpptcl/CMakeLists.txt (modified) (1 diff)
• src/external/ogreceguirenderer/CMakeLists.txt (modified) (1 diff)
• src/external/ois/CMakeLists.txt (modified) (1 diff)
• src/external/tinyxml/CMakeLists.txt (modified) (1 diff)
• src/external/tolua/CMakeLists.txt (modified) (1 diff)

code/branches/core5/cmake/ParseMacroArguments.cmake

@@ -39 +39 @@
   # Using LIST(FIND ...) speeds up the process
   SET(_keywords ${_switches} ${_list_names})
+
+  # Reset all arguments
+  FOREACH(_arg ${_switches} ${_list_names})
+    SET(_arg_${_arg})
+  ENDFOREACH(_arg)
 
   # Parse all the arguments and set the corresponding variable

code/branches/core5/cmake/TargetUtilities.cmake

@@ -67 +67 @@
 ENDIF()
 
-FUNCTION(ORXONOX_ADD_LIBRARY _target_name)
+MACRO(ORXONOX_ADD_LIBRARY _target_name)
   TU_ADD_TARGET(${_target_name} LIBRARY "STATIC;SHARED" ${ARGN})
-ENDFUNCTION(ORXONOX_ADD_LIBRARY)
-
-FUNCTION(ORXONOX_ADD_EXECUTABLE _target_name)
+ENDMACRO(ORXONOX_ADD_LIBRARY)
+
+MACRO(ORXONOX_ADD_EXECUTABLE _target_name)
   TU_ADD_TARGET(${_target_name} EXECUTABLE "WIN32" ${ARGN})
-ENDFUNCTION(ORXONOX_ADD_EXECUTABLE)
-
-
-FUNCTION(TU_ADD_TARGET _target_name _target_type _additional_switches)
+ENDMACRO(ORXONOX_ADD_EXECUTABLE)
+
+
+MACRO(TU_ADD_TARGET _target_name _target_type _additional_switches)
   CAPITALISE_NAME(${_target_name} _target_name_capitalised)
 
@@ -150 +150 @@
     SET(_arg_SHARED)
     SET(_arg_STATIC STATIC)
+  ENDIF()
+
+  # No warnings needed from third party libraries
+  IF(_arg_ORXONOX_EXTERNAL)
+    REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)
+    ADD_COMPILER_FLAGS("-w")
   ENDIF()
 
@@ -234 +240 @@
   ENDIF()
 
-ENDFUNCTION(TU_ADD_TARGET)
+ENDMACRO(TU_ADD_TARGET)
 
 

code/branches/core5/src/external/bullet/CMakeLists.txt

@@ -27 +27 @@
 ADD_SUBDIRECTORY(LinearMath)
 
-# No warnings needed from third party libraries
-REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)
-ADD_COMPILER_FLAGS("-w")
-
 ORXONOX_ADD_LIBRARY(bullet_orxonox
   ORXONOX_EXTERNAL

code/branches/core5/src/external/ceguilua/CMakeLists.txt

@@ -67 +67 @@
 )
 
-# No warnings needed from third party libraries
-REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)
-ADD_COMPILER_FLAGS("-w")
-
 SOURCE_GROUP("Source" FILES ${CEGUILUA_FILES})
 

code/branches/core5/src/external/cpptcl/CMakeLists.txt

@@ -32 +32 @@
 )
 
-# No warnings needed from third party libraries
-REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)
-ADD_COMPILER_FLAGS("-w")
-
 ORXONOX_ADD_LIBRARY(cpptcl_orxonox
   ORXONOX_EXTERNAL

code/branches/core5/src/external/ogreceguirenderer/CMakeLists.txt

@@ -30 +30 @@
 )
 
-# No warnings needed from third party libraries
-REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)
-ADD_COMPILER_FLAGS("-w")
-
 ORXONOX_ADD_LIBRARY(ogreceguirenderer_orxonox
   ORXONOX_EXTERNAL

code/branches/core5/src/external/ois/CMakeLists.txt

@@ -52 +52 @@
 ENDIF()
 
-# No warnings needed from third party libraries
-REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)
-ADD_COMPILER_FLAGS("-w")
-
 INCLUDE_DIRECTORIES(.)
 

code/branches/core5/src/external/tinyxml/CMakeLists.txt

@@ -33 +33 @@
 )
 
-# No warnings needed from third party libraries
-REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)
-ADD_COMPILER_FLAGS("-w")
-
 ORXONOX_ADD_LIBRARY(tinyxml++_orxonox
   ORXONOX_EXTERNAL

code/branches/core5/src/external/tolua/CMakeLists.txt

@@ -31 +31 @@
 COMPILATION_END
 )
-
-# No warnings needed from third party libraries
-REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)
-ADD_COMPILER_FLAGS("-w")
 
 ORXONOX_ADD_LIBRARY(tolua++_orxonox