[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33715] trunk/blender/build_files/cmake/ macros.cmake: fix for error in testing C/C++ flags
Campbell Barton
ideasman42 at gmail.com
Thu Dec 16 18:54:01 CET 2010
Revision: 33715
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33715
Author: campbellbarton
Date: 2010-12-16 18:54:00 +0100 (Thu, 16 Dec 2010)
Log Message:
-----------
fix for error in testing C/C++ flags
Modified Paths:
--------------
trunk/blender/build_files/cmake/macros.cmake
Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake 2010-12-16 17:19:24 UTC (rev 33714)
+++ trunk/blender/build_files/cmake/macros.cmake 2010-12-16 17:54:00 UTC (rev 33715)
@@ -275,15 +275,34 @@
endmacro()
+
+# XXX, until cmake fix this bug! from CheckCCompilerFlag.cmakem reported 11615
+INCLUDE(CheckCSourceCompiles)
+MACRO (CHECK_C_COMPILER_FLAG__INTERNAL _FLAG _RESULT)
+ SET(SAFE_CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}")
+ SET(CMAKE_REQUIRED_DEFINITIONS "${_FLAG}")
+ CHECK_C_SOURCE_COMPILES("int main(void) { return 0;}" ${_RESULT}
+ # Some compilers do not fail with a bad flag
+ FAIL_REGEX "unrecognized .*option" # GNU
+ FAIL_REGEX "ignoring unknown option" # MSVC
+ FAIL_REGEX "[Uu]nknown option" # HP
+ FAIL_REGEX "[Ww]arning: [Oo]ption" # SunPro
+ FAIL_REGEX "command option .* is not recognized" # XL
+ )
+ SET (CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}")
+ENDMACRO (CHECK_C_COMPILER_FLAG)
+# XXX, end duplicate code.
+
macro(ADD_CHECK_C_COMPILER_FLAG
_CFLAGS
_FLAG)
- include(CheckCCompilerFlag)
+ # include(CheckCCompilerFlag)
- CHECK_C_COMPILER_FLAG(${_FLAG} SUPPORT_WALL)
-
- if(SUPPORT_WALL)
+ # odd workaround
+ set(CFLAG_TEST "CFLAG_TEST")
+ CHECK_C_COMPILER_FLAG__INTERNAL("${_FLAG}" CFLAG_TEST)
+ if(CFLAG_TEST)
# message(STATUS "Using CFLAG: ${_FLAG}")
set(${_CFLAGS} "${${_CFLAGS}} ${_FLAG}")
else()
@@ -297,9 +316,10 @@
include(CheckCXXCompilerFlag)
- CHECK_CXX_COMPILER_FLAG(${_FLAG} SUPPORT_WALL)
-
- if(SUPPORT_WALL)
+ # odd workaround
+ set(CFLAG_TEST "CXXFLAG_TEST")
+ CHECK_CXX_COMPILER_FLAG("${_FLAG}" CXXFLAG_TEST)
+ if(CXXFLAG_TEST)
# message(STATUS "Using CXXFLAG: ${_FLAG}")
set(${_CXXFLAGS} "${${_CXXFLAGS}} ${_FLAG}")
else()
More information about the Bf-blender-cvs
mailing list