griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Unbreak build on macOS with AppleClang from recent cleanup

Browse Source 
Exact an exact match with Clang broke building when the compiler ID
was "AppleClang", reverting parts of [0].

[0]: 6549019ae1
This commit is contained in:
Campbell Barton
2024-03-07 19:56:58 +11:00
parent 6549019ae1
commit 0cd414120b
16 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extern/CMakeLists.txt vendored
View File

@@ -14,7 +14,7 @@ if(CMAKE_COMPILER_IS_GNUCC)
remove_cc_flag(
"-Wmisleading-indentation"
)
elseif(CMAKE_C_COMPILER_ID STREQUAL "Clang")
elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
remove_cc_flag(
"-Weverything"
)

2
extern/bullet2/CMakeLists.txt vendored
View File

@@ -3,7 +3,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# avoid noisy warnings
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
remove_cc_flag(
"-Wall"
)

2
extern/lzma/CMakeLists.txt vendored
View File

@@ -3,7 +3,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# avoid noisy warnings
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
add_c_flag(
"-Wno-self-assign"
)

2
extern/quadriflow/CMakeLists.txt vendored
View File

@@ -3,7 +3,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# avoid noisy warnings
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
add_c_flag(
"-Wno-unused-result"
)

2
extern/vulkan_memory_allocator/CMakeLists.txt vendored
View File

@@ -27,7 +27,7 @@ set(LIB
blender_add_lib(extern_vulkan_memory_allocator "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
target_compile_options(extern_vulkan_memory_allocator
PRIVATE "-Wno-nullability-completeness"
)