Skip to content

Commit d729919

Browse files
committed
Switch Windows build configuration to use LLVM and GCC tooling
Replaced MSVC with LLVM (v17.0) as the compiler and updated the build environment to use GCC for ccache. Simplified configuration by removing MSVC-specific setup steps and Intel OpenMP dependencies. Updated associated build and install scripts to reflect the new toolchain.
1 parent 751a475 commit d729919

1 file changed

Lines changed: 19 additions & 22 deletions

File tree

.github/workflows/main.yml

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -837,54 +837,51 @@ jobs:
837837
- uses: actions/checkout@v4
838838
with:
839839
submodules: recursive
840-
- name: Add msbuild to PATH
841-
uses: microsoft/setup-msbuild@v2
840+
841+
- name: Setup LLVM
842+
uses: KyleMayes/install-llvm-action@v1
842843
with:
843-
vs-version: 'latest'
844+
version: "17.0"
845+
844846
- name: Setup MPI
845847
uses: mpi4py/setup-mpi@v1
846848
with:
847849
mpi: msmpi
850+
848851
- name: Setup ccache
849852
uses: Chocobo1/setup-ccache-action@v1
850853
with:
851-
windows_compile_environment: msvc
854+
windows_compile_environment: gcc
855+
852856
- name: Setup ninja
853857
uses: seanmiddleditch/gha-setup-ninja@v6
854-
- name: Setup MSVC for Ninja
855-
uses: ilammy/msvc-dev-cmd@v1
856-
- name: Install Intel OpenMP via NuGet
857-
run: |
858-
nuget install intelopenmp.redist.win
859-
shell: pwsh
858+
860859
- name: CMake configure
861860
run: >
862861
cmake -S . -B build -G Ninja
863-
-D CMAKE_C_COMPILER=clang-cl
864-
-D CMAKE_CXX_COMPILER=clang-cl
862+
-D CMAKE_C_COMPILER=clang
863+
-D CMAKE_CXX_COMPILER=clang++
865864
-D CMAKE_C_COMPILER_LAUNCHER=ccache
866865
-D CMAKE_CXX_COMPILER_LAUNCHER=ccache
867866
-D CMAKE_BUILD_TYPE=Release
868867
-D CMAKE_INSTALL_PREFIX=install
869-
-D CMAKE_INCLUDE_PATH="C:/Program Files (x86)/Intel/oneAPI/compiler/latest/windows/include"
870-
-D CMAKE_LIBRARY_PATH="C:/Program Files (x86)/Intel/oneAPI/compiler/latest/windows/lib/intel64_win"
871-
-D CMAKE_EXE_LINKER_FLAGS="/NODEFAULTLIB:vcomp.lib \"C:/Program Files (x86)/Intel/oneAPI/compiler/latest/windows/lib/intel64_win/libiomp5md.lib\""
872-
shell: pwsh
873868
env:
874-
CC: clang-cl
875-
CXX: clang-cl
869+
CC: clang
870+
CXX: clang++
871+
876872
- name: Build project
877873
run: cmake --build build --config Release --parallel
878-
shell: pwsh
879874
env:
880-
CC: clang-cl
881-
CXX: clang-cl
875+
CC: clang
876+
CXX: clang++
877+
882878
- name: Install project
883879
run: cmake --install build
884-
shell: pwsh
880+
885881
- name: Archive installed package
886882
run: Compress-Archive -Path install -DestinationPath windows-clang-install.zip
887883
shell: pwsh
884+
888885
- name: Upload installed package
889886
uses: actions/upload-artifact@v4
890887
with:

0 commit comments

Comments
 (0)