Skip to content

Commit dbd8d2a

Browse files
committed
fix build
1 parent 9046de8 commit dbd8d2a

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

.github/workflows/cmake.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ jobs:
5454
cmake -B build -G Ninja \
5555
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
5656
-DCMAKE_TOOLCHAIN_FILE=cmake/toolchain.cmake \
57+
-DCMAKE_C_COMPILER=clang \
58+
-DCMAKE_CXX_COMPILER=clang++ \
5759
-DCLICE_ENABLE_TEST=ON \
5860
-DCLICE_CI_ENVIRONMENT=ON
5961
cmake --build build

CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ if(WIN32)
8686
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreadedDLL")
8787
target_link_options(clice_options INTERFACE
8888
-fuse-ld=lld-link
89-
-Wl,/OPT:REF,/OPT:NOICF
89+
-Wl,/OPT:REF
90+
#,/OPT:NOICF
9091
)
9192
elseif(APPLE)
9293
target_link_options(clice_options INTERFACE
@@ -101,7 +102,8 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
101102
)
102103
endif()
103104

104-
if (MSVC)
105+
if(MSVC OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND
106+
CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC"))
105107
target_compile_options(clice_options INTERFACE
106108
/GR-
107109
/EHsc-

0 commit comments

Comments
 (0)