diff --git a/.github/workflows/build_niftyreg.yml b/.github/workflows/build_and_test.yml similarity index 91% rename from .github/workflows/build_niftyreg.yml rename to .github/workflows/build_and_test.yml index 38226f0b..2db525d5 100644 --- a/.github/workflows/build_niftyreg.yml +++ b/.github/workflows/build_and_test.yml @@ -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++" @@ -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 @@ -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) @@ -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 @@ -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 diff --git a/niftyreg_build_version.txt b/niftyreg_build_version.txt index d22307c4..8643cf6d 100644 --- a/niftyreg_build_version.txt +++ b/niftyreg_build_version.txt @@ -1 +1 @@ -88 +89