[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41420] trunk/blender: hopefully fix problem with cmake on osx (older gcc version)

Campbell Barton ideasman42 at gmail.com
Tue Nov 1 01:34:13 CET 2011


Revision: 41420
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41420
Author:   campbellbarton
Date:     2011-11-01 00:34:09 +0000 (Tue, 01 Nov 2011)
Log Message:
-----------
hopefully fix problem with cmake on osx (older gcc version)

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

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2011-10-31 17:00:59 UTC (rev 41419)
+++ trunk/blender/CMakeLists.txt	2011-11-01 00:34:09 UTC (rev 41420)
@@ -1255,6 +1255,8 @@
 
 	# flags to undo strict flags
 	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_DEPRECATED_DECLARATIONS -Wno-deprecated-declarations)
+	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER        -Wno-unused-parameter)
+	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_BUT_SET_VARIABLE -Wno-unused-but-set-variable)
 
 elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
 

Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake	2011-10-31 17:00:59 UTC (rev 41419)
+++ trunk/blender/build_files/cmake/macros.cmake	2011-11-01 00:34:09 UTC (rev 41420)
@@ -413,8 +413,7 @@
 		remove_cc_flag("-Werror")
 
 		# negate flags implied by '-Wall'
-		add_cc_flag("-Wno-unused-parameter")
-		add_cc_flag("-Wno-unused-but-set-variable")
+		add_cc_flag("${CC_REMOVE_STRICT_FLAGS}")
 	endif()
 
 	if(MSVC)




More information about the Bf-blender-cvs mailing list