diff --git a/.github/workflows/conda_build.yaml b/.github/workflows/conda_build.yaml index f8b18878..842d98b7 100644 --- a/.github/workflows/conda_build.yaml +++ b/.github/workflows/conda_build.yaml @@ -51,7 +51,7 @@ jobs: - name: Build library run: | - conda build conda --output-folder conda_package + conda build conda --output-folder conda_package --variant-config-files conda/variants/unix.yaml - name: Upload artifact uses: actions/upload-artifact@v4 @@ -145,7 +145,7 @@ jobs: - name: Build library run: | - conda build conda --output-folder conda_package --variant-config-files conda/variants/macOS.yaml + conda build conda --output-folder conda_package --variant-config-files conda/variants/unix.yaml - name: Upload artifact uses: actions/upload-artifact@v4 diff --git a/.github/workflows/test_library.yaml b/.github/workflows/test_library.yaml index 605211b4..54db2656 100644 --- a/.github/workflows/test_library.yaml +++ b/.github/workflows/test_library.yaml @@ -7,9 +7,6 @@ concurrency: on: [push, pull_request] -env: - COMPILER: c++ - jobs: Tests-Viewshed-library: @@ -60,15 +57,16 @@ jobs: -S . \ -B build \ -G Ninja \ - -DCMAKE_CXX_COMPILER=${COMPILER} \ - -DCMAKE_BUILD_TYPE=Release \ - -DPACK_DEB:bool=off \ - -DBUILD_DOCUMENTATION:bool=off \ - -DBUILD_TESTS:bool=on \ - -DCELL_EVENT_DATA_FLOAT:bool=on \ - -DOUTPUT_RASTER_DATA_FLOAT:bool=on \ - -DNEEDS_QT:bool=off \ - -DBUILD_GUI_APP:bool=off + -D CMAKE_C_COMPILER=clang \ + -D CMAKE_CXX_COMPILER=clang++ \ + -D CMAKE_BUILD_TYPE=Release \ + -D PACK_DEB:bool=off \ + -D BUILD_DOCUMENTATION:bool=off \ + -D BUILD_TESTS:bool=on \ + -D CELL_EVENT_DATA_FLOAT:bool=on \ + -D OUTPUT_RASTER_DATA_FLOAT:bool=on \ + -D NEEDS_QT:bool=off \ + -D BUILD_GUI_APP:bool=off - name: Build run: | @@ -92,15 +90,16 @@ jobs: -S . \ -B build \ -G Ninja \ - -DCMAKE_CXX_COMPILER=${COMPILER} \ - -DCMAKE_BUILD_TYPE=Release \ - -DPACK_DEB:bool=off \ - -DBUILD_DOCUMENTATION:bool=off \ - -DBUILD_TESTS:bool=on \ - -DCELL_EVENT_DATA_FLOAT:bool=off \ - -DOUTPUT_RASTER_DATA_FLOAT:bool=off \ - -DNEEDS_QT:bool=off \ - -DBUILD_GUI_APP:bool=off + -D CMAKE_C_COMPILER=clang \ + -D CMAKE_CXX_COMPILER=clang++ \ + -D CMAKE_BUILD_TYPE=Release \ + -D PACK_DEB:bool=off \ + -D BUILD_DOCUMENTATION:bool=off \ + -D BUILD_TESTS:bool=on \ + -D CELL_EVENT_DATA_FLOAT:bool=off \ + -D OUTPUT_RASTER_DATA_FLOAT:bool=off \ + -D NEEDS_QT:bool=off \ + -D BUILD_GUI_APP:bool=off cmake --build build --config Release --target build_tests cmake --build build --config Release --target run_tests @@ -153,18 +152,19 @@ jobs: run: | cmake \ -S . \ - -Bbuild \ + -B build \ -G Ninja \ - -DCMAKE_CXX_COMPILER=${COMPILER} \ - -DCMAKE_BUILD_TYPE=Release \ - -DPACK_DEB:bool=off \ - -DBUILD_DOCUMENTATION:bool=off \ - -DBUILD_TESTS:bool=on \ - -DCELL_EVENT_DATA_FLOAT:bool=on \ - -DOUTPUT_RASTER_DATA_FLOAT:bool=on \ - -DNEEDS_QT:bool=on \ - -DBUILD_GUI_APP:bool=on \ - -DCMAKE_INSTALL_PREFIX=/usr \ + -D CMAKE_C_COMPILER=clang \ + -D CMAKE_CXX_COMPILER=clang++ \ + -D CMAKE_BUILD_TYPE=Release \ + -D PACK_DEB:bool=off \ + -D BUILD_DOCUMENTATION:bool=off \ + -D BUILD_TESTS:bool=on \ + -D CELL_EVENT_DATA_FLOAT:bool=on \ + -D OUTPUT_RASTER_DATA_FLOAT:bool=on \ + -D NEEDS_QT:bool=on \ + -D BUILD_GUI_APP:bool=on \ + -D CMAKE_INSTALL_PREFIX=/usr \ - name: Run Tests even with Qt id: unittestsqt diff --git a/conda/variants/macOS.yaml b/conda/variants/unix.yaml similarity index 100% rename from conda/variants/macOS.yaml rename to conda/variants/unix.yaml diff --git a/scripts/install.sh b/scripts/install.sh index 89ec24f6..27382ed9 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -4,6 +4,7 @@ cmake \ -S . \ -B build \ -G Ninja \ + -D CMAKE_C_COMPILER=clang \ -D CMAKE_CXX_COMPILER=clang++ \ -D CMAKE_BUILD_TYPE=Release \ -D PACK_DEB:bool=ON \