[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34931] trunk/blender/build_files/cmake/ macros.cmake: CMake: remove workaround for cmake 2.8. 3 problem testing -Werror=strict-prototypes flag (now 2.8.4 is out).

[Campbell Barton]

Revision: 34931
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34931
Author:   campbellbarton
Date:     2011-02-17 11:38:02 +0000 (Thu, 17 Feb 2011)
Log Message:
-----------
CMake: remove workaround for cmake 2.8.3 problem testing -Werror=strict-prototypes flag (now 2.8.4 is out).
This is harmless, CMake 2.8.3 just wont build with -Werror=strict-prototypes which is nice for picky devs.

Modified Paths:
--------------
    trunk/blender/build_files/cmake/macros.cmake

Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake	2011-02-17 10:18:14 UTC (rev 34930)
+++ trunk/blender/build_files/cmake/macros.cmake	2011-02-17 11:38:02 UTC (rev 34931)
@@ -299,32 +299,14 @@
 
 endmacro()
 
-
-# XXX, until cmake 2.8.4 is released.
-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__INTERNAL)
-# XXX, end duplicate code.
-
 macro(ADD_CHECK_C_COMPILER_FLAG
 	_CFLAGS
 	_CACHE_VAR
 	_FLAG)
 
-	# include(CheckCCompilerFlag)
+	include(CheckCCompilerFlag)
 
-	CHECK_C_COMPILER_FLAG__INTERNAL("${_FLAG}" "${_CACHE_VAR}")
+	CHECK_C_COMPILER_FLAG("${_FLAG}" "${_CACHE_VAR}")
 	if(${_CACHE_VAR})
 		# message(STATUS "Using CFLAG: ${_FLAG}")
 		set(${_CFLAGS} "${${_CFLAGS}} ${_FLAG}")