diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-25 08:43:51 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-25 08:43:51 +0300 |
| commit | d32e4ca70161eb83179e4ebd1dc538afc1b311c1 (patch) | |
| tree | 1f7e12fb8558f2a7b3c083bc304389acda19a208 /build_files | |
| parent | a5b7f1ef535038be549530612c7eed9109e1d4b4 (diff) | |
| parent | f3b9fa53935e1f199063b020dded04135267b0a8 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/macros.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index d6fde945173..ce2241a775d 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -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) |