Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/conda_build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
64 changes: 32 additions & 32 deletions .github/workflows/test_library.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ concurrency:

on: [push, pull_request]

env:
COMPILER: c++

jobs:

Tests-Viewshed-library:
Expand Down Expand Up @@ -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: |
Expand All @@ -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

Expand Down Expand Up @@ -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
Expand Down
File renamed without changes.
1 change: 1 addition & 0 deletions scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
Loading