[Bf-blender-cvs] [f3b9fa53935] master: CMake: correct remove_strict_cxx_flags_file

Campbell Barton noreply at git.blender.org
Mon Jun 25 07:36:58 CEST 2018


Commit: f3b9fa53935e1f199063b020dded04135267b0a8
Author: Campbell Barton
Date:   Mon Jun 25 07:30:00 2018 +0200
Branches: master
https://developer.blender.org/rBf3b9fa53935e1f199063b020dded04135267b0a8

CMake: correct remove_strict_cxx_flags_file

Was still using C-flags.

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

M	build_files/cmake/macros.cmake

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

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index d265b8ffad2..5d5425a9fc6 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -1124,7 +1124,7 @@ macro(remove_strict_c_flags_file
 	filenames)
 	foreach(_SOURCE ${ARGV})
 		if(CMAKE_COMPILER_IS_GNUCC OR
-		  (CMAKE_C_COMPILER_ID MATCHES "Clang"))
+		   (CMAKE_C_COMPILER_ID MATCHES "Clang"))
 			set_source_files_properties(${_SOURCE}
 				PROPERTIES
 					COMPILE_FLAGS "${C_REMOVE_STRICT_FLAGS}"
@@ -1142,10 +1142,10 @@ macro(remove_strict_cxx_flags_file
 	remove_strict_c_flags_file(${filenames} ${ARHV})
 	foreach(_SOURCE ${ARGV})
 		if(CMAKE_COMPILER_IS_GNUCC OR
-		  (CMAKE_C_COMPILER_ID MATCHES "Clang"))
+		   (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
 			set_source_files_properties(${_SOURCE}
 				PROPERTIES
-					COMPILE_FLAGS "${C_REMOVE_STRICT_FLAGS}"
+					COMPILE_FLAGS "${CXX_REMOVE_STRICT_FLAGS}"
 			)
 		endif()
 		if(MSVC)



More information about the Bf-blender-cvs mailing list