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:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-03-05 18:14:46 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-03-05 18:14:46 +0300
commit84a154ac68d01583b318cca43d8d8bbded127700 (patch)
tree6414db1d253a5bbf0314a95b1cef47e2ef9da83c /build_files/cmake/macros.cmake
parentae9beb1cead99ced03798f6acad8082408323991 (diff)
parentdf267bd4c48a3b73ad959951419161ae8f9ed126 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files/cmake/macros.cmake')
-rw-r--r--build_files/cmake/macros.cmake4
1 files changed, 3 insertions, 1 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 09bc01fcae3..ab90a29e430 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -1144,7 +1144,9 @@ endmacro()
# External libs may need 'signed char' to be default.
macro(remove_cc_flag_unsigned_char)
- if(CMAKE_C_COMPILER_ID MATCHES "^(GNU|Clang|Intel)$")
+ if(CMAKE_COMPILER_IS_GNUCC OR
+ (CMAKE_C_COMPILER_ID MATCHES "Clang") OR
+ (CMAKE_C_COMPILER_ID MATCHES "Intel"))
remove_cc_flag("-funsigned-char")
elseif(MSVC)
remove_cc_flag("/J")