Skip to content

Commit

Permalink
Issue #85: Adding macos and win
Browse files Browse the repository at this point in the history
  • Loading branch information
mmodat committed Jul 28, 2022
1 parent 23471e3 commit bfa2776
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
cxx-compiler: "g++"
use_cuda: "OFF"
use_opencl: "OFF"
use_openmp: "OFF"
use_openmp: "ON"
- os: macos-11
c-compiler: "gcc"
cxx-compiler: "g++"
Expand All @@ -25,7 +25,7 @@ jobs:
cxx-compiler: "cl.exe"
use_cuda: "OFF"
use_opencl: "OFF"
use_openmp: "OFF"
use_openmp: "ON"
vcvars64: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
steps:
- uses: actions/checkout@v3
Expand All @@ -39,7 +39,7 @@ jobs:
git clone https://github.com/catchorg/Catch2.git
cd Catch2
cmake -Bbuild -H. -DBUILD_TESTING=OFF
sudo cmake --build build/ --target install
sudo cmake --build build/ --target install --config Release
shell: bash

- name: Install Catch2 (windows)
Expand All @@ -49,7 +49,7 @@ jobs:
git clone https://github.com/catchorg/Catch2.git
cd Catch2
cmake -Bbuild -H. -DBUILD_TESTING=OFF
cmake --build build/ --target install
cmake --build build/ --target install --config Release
shell: cmd

- name: Configure NiftyReg
Expand Down Expand Up @@ -80,15 +80,14 @@ jobs:

- name: Build NiftyReg
if: matrix.os != 'windows-2022'
run: make
working-directory: build
run: cmake --build build --config Release
shell: bash

- name: Build NiftyReg (windows)
if: matrix.os == 'windows-2022'
run: |
call "${{ matrix.vcvars64 }}"
cmake --build build
cmake --build build --config Release
shell: cmd

- name: Run tests
Expand Down
2 changes: 1 addition & 1 deletion niftyreg_build_version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
88
89

0 comments on commit bfa2776

Please sign in to comment.