Skip to content

fix windows ci #2400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 30, 2024
Merged

fix windows ci #2400

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f16e732
fix windows ci to use clang-cl
fabinsch Aug 29, 2024
9d87331
cmake: do not use CMP0167 for clang-cl on win
fabinsch Aug 30, 2024
192e2c6
changelog: sync
jcarpent Aug 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/windows-conda.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,9 @@ jobs:
:: This must be done here and not in env since
:: cxx-compiler activation script set this variable
:: and is called before.
set CC=${{ matrix.compiler.cmd }}
set CXX=${{ matrix.compiler.cmd }}
set CC=${{ matrix.compiler }}.exe
set CXX=${{ matrix.compiler }}.exe
echo Compiler set to: %CC%

call conda list

Expand Down
6 changes: 4 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,10 @@ set(DOXYGEN_USE_TEMPLATE_CSS YES)

# Use BoostConfig module distributed by boost library instead of using FindBoost module distributed
# by CMake
if(POLICY CMP0167)
cmake_policy(SET CMP0167 NEW)
if(NOT WIN32 OR NOT ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
if(POLICY CMP0167)
cmake_policy(SET CMP0167 NEW)
endif()
endif()
include("${JRL_CMAKE_MODULES}/base.cmake")

Expand Down