Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-11-01 04:34:09 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-11-01 04:34:09 +0400
commita5959e767e1fce78fa1876e8791667a377ac51f1 (patch)
treeaf85d25750099d24394874c0d99f59f5f89b8f57
parent4e0d8ccf9619f72fb6cbca1d18647f9dff1f0d73 (diff)
hopefully fix problem with cmake on osx (older gcc version)
-rw-r--r--CMakeLists.txt2
-rw-r--r--build_files/cmake/macros.cmake3
2 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bcec149eda8..f421c2c9395 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1255,6 +1255,8 @@ if(CMAKE_COMPILER_IS_GNUCC)
# 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")
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index f767376d122..10f89797754 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -413,8 +413,7 @@ macro(remove_strict_flags)
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)