[Bf-blender-cvs] [cd7853b] master: CMake: quiet warnings in GTest

Campbell Barton noreply at git.blender.org
Tue Jun 23 06:39:11 CEST 2015


Commit: cd7853be2277320e9c1a7209d95c7778ae0408de
Author: Campbell Barton
Date:   Tue Jun 23 14:33:17 2015 +1000
Branches: master
https://developer.blender.org/rBcd7853be2277320e9c1a7209d95c7778ae0408de

CMake: quiet warnings in GTest

===================================================================

M	build_files/cmake/macros.cmake
M	extern/gtest/CMakeLists.txt

===================================================================

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index f5efd22..c739841 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -950,8 +950,10 @@ macro(remove_strict_flags)
 		remove_cc_flag(
 			"-Wstrict-prototypes"
 			"-Wmissing-prototypes"
-			"-Wunused-parameter"
+			"-Wmissing-format-attribute"
+			"-Wunused-local-typedefs"
 			"-Wunused-macros"
+			"-Wunused-parameter"
 			"-Wwrite-strings"
 			"-Wredundant-decls"
 			"-Wundef"
diff --git a/extern/gtest/CMakeLists.txt b/extern/gtest/CMakeLists.txt
index 86f2aaa..21b296f 100644
--- a/extern/gtest/CMakeLists.txt
+++ b/extern/gtest/CMakeLists.txt
@@ -21,6 +21,13 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
+# avoid noisy warnings
+if(CMAKE_COMPILER_IS_GNUCC)
+	remove_cc_flag(
+		"-Wmissing-declarations"
+	)
+endif()
+
 set(INC
 	.
 	include




More information about the Bf-blender-cvs mailing list