juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-08-26 19:39:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: exclude clang-cl from MSVC-only compiler guards in CMake

Browse Source 
clang-cl defines MSVC in CMake, but some guarded blocks apply flags or behavior
that are specific to cl.exe and should not be passed to clang-cl.

Exclude Clang from those MSVC-only branches so clang-cl follows the compatible
compiler path instead of inheriting cl.exe-only settings.
This commit is contained in:
Gabriel
2026-06-24 00:36:59 -03:00
parent 7aaeea2bd2
commit d865e9e6e1
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
deps_src/clipper2/CMakeLists.txt
View File

@@ -37,7 +37,11 @@ target_include_directories(Clipper2
) )
if (WIN32) if (WIN32)
target_compile_options(Clipper2 PRIVATE /W4 /WX) if (MSVC AND NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
target_compile_options(Clipper2 PRIVATE /W4 /WX)
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
target_compile_options(Clipper2 PRIVATE /W4)
endif()
else() else()
target_compile_options(Clipper2 PRIVATE -Wall -Wextra -Wpedantic -Werror) target_compile_options(Clipper2 PRIVATE -Wall -Wextra -Wpedantic -Werror)
target_link_libraries(Clipper2 PUBLIC -lm) target_link_libraries(Clipper2 PUBLIC -lm)

2
deps_src/miniz/CMakeLists.txt
View File

@@ -11,6 +11,8 @@ add_library(miniz_static STATIC
if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU") if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU")
target_compile_definitions(miniz_static PRIVATE _GNU_SOURCE) target_compile_definitions(miniz_static PRIVATE _GNU_SOURCE)
elseif (CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_C_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
target_compile_options(miniz_static PRIVATE /clang:-Wno-error=incompatible-pointer-types)
endif() endif()
target_link_libraries(miniz INTERFACE miniz_static) target_link_libraries(miniz INTERFACE miniz_static)