[Orxonox-commit 1151] r5872 - in code/branches/core5: cmake src/external/bullet src/external/ceguilua src/external/cpptcl src/external/ogreceguirenderer src/external/ois src/external/tinyxml src/external/tolua
rgrieder at orxonox.net
rgrieder at orxonox.net
Sun Oct 4 19:27:35 CEST 2009
Author: rgrieder
Date: 2009-10-04 19:27:35 +0200 (Sun, 04 Oct 2009)
New Revision: 5872
Modified:
code/branches/core5/cmake/ParseMacroArguments.cmake
code/branches/core5/cmake/TargetUtilities.cmake
code/branches/core5/src/external/bullet/CMakeLists.txt
code/branches/core5/src/external/ceguilua/CMakeLists.txt
code/branches/core5/src/external/cpptcl/CMakeLists.txt
code/branches/core5/src/external/ogreceguirenderer/CMakeLists.txt
code/branches/core5/src/external/ois/CMakeLists.txt
code/branches/core5/src/external/tinyxml/CMakeLists.txt
code/branches/core5/src/external/tolua/CMakeLists.txt
Log:
Removing redundancy: Specifying ORXONOX_EXTERAL for a target should already suppress all warnings.
Modified: code/branches/core5/cmake/ParseMacroArguments.cmake
===================================================================
--- code/branches/core5/cmake/ParseMacroArguments.cmake 2009-10-04 16:06:33 UTC (rev 5871)
+++ code/branches/core5/cmake/ParseMacroArguments.cmake 2009-10-04 17:27:35 UTC (rev 5872)
@@ -39,6 +39,11 @@
# 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
# If the option is just a switch, set the variable to its name for later use
FOREACH(_arg ${ARGN})
Modified: code/branches/core5/cmake/TargetUtilities.cmake
===================================================================
--- code/branches/core5/cmake/TargetUtilities.cmake 2009-10-04 16:06:33 UTC (rev 5871)
+++ code/branches/core5/cmake/TargetUtilities.cmake 2009-10-04 17:27:35 UTC (rev 5872)
@@ -66,16 +66,16 @@
INCLUDE(PrecompiledHeaderFiles)
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)
+ENDMACRO(ORXONOX_ADD_LIBRARY)
-FUNCTION(ORXONOX_ADD_EXECUTABLE _target_name)
+MACRO(ORXONOX_ADD_EXECUTABLE _target_name)
TU_ADD_TARGET(${_target_name} EXECUTABLE "WIN32" ${ARGN})
-ENDFUNCTION(ORXONOX_ADD_EXECUTABLE)
+ENDMACRO(ORXONOX_ADD_EXECUTABLE)
-FUNCTION(TU_ADD_TARGET _target_name _target_type _additional_switches)
+MACRO(TU_ADD_TARGET _target_name _target_type _additional_switches)
CAPITALISE_NAME(${_target_name} _target_name_capitalised)
# Specify all possible options (either switch or with add. arguments)
@@ -151,6 +151,12 @@
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()
+
# Set default linking if required
IF(NOT _arg_SHARED AND NOT _arg_STATIC)
IF("${ORXONOX_DEFAULT_LINK}" STREQUAL "STATIC")
@@ -233,7 +239,7 @@
ENDIF()
ENDIF()
-ENDFUNCTION(TU_ADD_TARGET)
+ENDMACRO(TU_ADD_TARGET)
# Creates a helper file with name <name_of_the_library>${ORXONOX_MODULE_EXTENSION}
Modified: code/branches/core5/src/external/bullet/CMakeLists.txt
===================================================================
--- code/branches/core5/src/external/bullet/CMakeLists.txt 2009-10-04 16:06:33 UTC (rev 5871)
+++ code/branches/core5/src/external/bullet/CMakeLists.txt 2009-10-04 17:27:35 UTC (rev 5872)
@@ -26,10 +26,6 @@
ADD_SUBDIRECTORY(BulletDynamics)
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
NO_DLL_INTERFACE
Modified: code/branches/core5/src/external/ceguilua/CMakeLists.txt
===================================================================
--- code/branches/core5/src/external/ceguilua/CMakeLists.txt 2009-10-04 16:06:33 UTC (rev 5871)
+++ code/branches/core5/src/external/ceguilua/CMakeLists.txt 2009-10-04 17:27:35 UTC (rev 5872)
@@ -66,10 +66,6 @@
COMMENT "Generating tolua bind files for package CEGUILua"
)
-# No warnings needed from third party libraries
-REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)
-ADD_COMPILER_FLAGS("-w")
-
SOURCE_GROUP("Source" FILES ${CEGUILUA_FILES})
SET(CEGUILUA_LIBRARY ceguilua_orxonox)
Modified: code/branches/core5/src/external/cpptcl/CMakeLists.txt
===================================================================
--- code/branches/core5/src/external/cpptcl/CMakeLists.txt 2009-10-04 16:06:33 UTC (rev 5871)
+++ code/branches/core5/src/external/cpptcl/CMakeLists.txt 2009-10-04 17:27:35 UTC (rev 5872)
@@ -31,10 +31,6 @@
details/methods_v.h
)
-# No warnings needed from third party libraries
-REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)
-ADD_COMPILER_FLAGS("-w")
-
ORXONOX_ADD_LIBRARY(cpptcl_orxonox
ORXONOX_EXTERNAL
NO_DLL_INTERFACE
Modified: code/branches/core5/src/external/ogreceguirenderer/CMakeLists.txt
===================================================================
--- code/branches/core5/src/external/ogreceguirenderer/CMakeLists.txt 2009-10-04 16:06:33 UTC (rev 5871)
+++ code/branches/core5/src/external/ogreceguirenderer/CMakeLists.txt 2009-10-04 17:27:35 UTC (rev 5872)
@@ -29,10 +29,6 @@
COMPILATION_END
)
-# No warnings needed from third party libraries
-REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)
-ADD_COMPILER_FLAGS("-w")
-
ORXONOX_ADD_LIBRARY(ogreceguirenderer_orxonox
ORXONOX_EXTERNAL
LINK_LIBRARIES
Modified: code/branches/core5/src/external/ois/CMakeLists.txt
===================================================================
--- code/branches/core5/src/external/ois/CMakeLists.txt 2009-10-04 16:06:33 UTC (rev 5871)
+++ code/branches/core5/src/external/ois/CMakeLists.txt 2009-10-04 17:27:35 UTC (rev 5872)
@@ -51,10 +51,6 @@
ADD_SUBDIRECTORY(linux)
ENDIF()
-# No warnings needed from third party libraries
-REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)
-ADD_COMPILER_FLAGS("-w")
-
INCLUDE_DIRECTORIES(.)
ORXONOX_ADD_LIBRARY(ois_orxonox
Modified: code/branches/core5/src/external/tinyxml/CMakeLists.txt
===================================================================
--- code/branches/core5/src/external/tinyxml/CMakeLists.txt 2009-10-04 16:06:33 UTC (rev 5871)
+++ code/branches/core5/src/external/tinyxml/CMakeLists.txt 2009-10-04 17:27:35 UTC (rev 5872)
@@ -32,10 +32,6 @@
COMPILATION_END
)
-# No warnings needed from third party libraries
-REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)
-ADD_COMPILER_FLAGS("-w")
-
ORXONOX_ADD_LIBRARY(tinyxml++_orxonox
ORXONOX_EXTERNAL
NO_DLL_INTERFACE
Modified: code/branches/core5/src/external/tolua/CMakeLists.txt
===================================================================
--- code/branches/core5/src/external/tolua/CMakeLists.txt 2009-10-04 16:06:33 UTC (rev 5871)
+++ code/branches/core5/src/external/tolua/CMakeLists.txt 2009-10-04 17:27:35 UTC (rev 5872)
@@ -31,10 +31,6 @@
COMPILATION_END
)
-# No warnings needed from third party libraries
-REMOVE_COMPILER_FLAGS("-W3 -W4" MSVC)
-ADD_COMPILER_FLAGS("-w")
-
ORXONOX_ADD_LIBRARY(tolua++_orxonox
ORXONOX_EXTERNAL
DEFINE_SYMBOL
More information about the Orxonox-commit
mailing list