Merge branch 'master' into blender2.8
[blender.git] / build_files / cmake / macros.cmake
index d6fde945173b6ef28ef3973a4d745a91ccc12647..ce2241a775dd8149c3ab9f8fc10230a95ef1a67c 100644 (file)
@@ -1137,7 +1137,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}"
@@ -1155,10 +1155,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)