Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initial CMake Refactoring #631

Merged
merged 39 commits into from
Sep 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
4a96b21
cmake: reorg root CMakeLists; rm unused FindNetCDF; update FindUDUNITS2
program-- Sep 6, 2023
915041d
cmake: ensure build is okay with changes
program-- Sep 6, 2023
0df7fa7
git: update .gitignore; cmake: update cmake modules
program-- Sep 6, 2023
ecf0ae1
cmake: rm min required calls in ngen::core
program-- Sep 6, 2023
29e184e
cmake: rm min required calls in ngen::forcing/geojson
program-- Sep 6, 2023
f0d4bae
cmake: rm min required calls in remaining source dirs
program-- Sep 6, 2023
3c4fa1f
cmake: rm min required call in core_nexus
program-- Sep 6, 2023
f9b7316
cmake: revert changing udunits2 target name
program-- Sep 6, 2023
88dfd05
cmake: rename (add_test -> ngen_add_test) and refactor
program-- Sep 6, 2023
40f9bd4
cmake: add deprecated options for compat [no ci]
program-- Sep 6, 2023
19a1cf3
cmake: fix incorrect docstring for ngen_add_test [no ci]
program-- Sep 6, 2023
489dec7
cmake: add deprecated options
program-- Sep 7, 2023
1a1bef3
cmake: default NGEN_WITH_ROUTING to ON
program-- Sep 7, 2023
7e9d2ed
cmake: see extended commit
program-- Sep 7, 2023
514e40f
cmake: conditionalize NGen::routing again
program-- Sep 7, 2023
1289516
cmake: default MPI builds; better searching for BMI iso_c handling
program-- Sep 7, 2023
7a99b44
cmake: link MPI-based builds to the MPI targets
program-- Sep 7, 2023
a85badc
cmake: fix missing call to ngen_add_test
program-- Sep 7, 2023
73bcc71
cmake: change defaults again; attempt to fix CI issues
program-- Sep 7, 2023
dbb4c60
cmake: attempt to fix udunits macOS inclusion
program-- Sep 7, 2023
4d5baa8
cmake: another attempt at fixing udunits inclusion
program-- Sep 7, 2023
76ba4ee
cmake: workaround for udunits2 inclusion on macOS
program-- Sep 7, 2023
e2eecc5
cmake: set sqlite3 support default to OFF
program-- Sep 7, 2023
2dc180e
cmake: another attempt
program-- Sep 7, 2023
98d567d
cmake: revert some changes; include UDUNITS2_INCLUDE at compiler level
program-- Sep 8, 2023
dae6d15
Move C++ standards options before declaring project and main executab…
PhilMiller Sep 8, 2023
8cada60
cmake: remove unnecessary comments; gh: update action to default sqli…
program-- Sep 8, 2023
e30a8ec
gh: rm accidental slash
program-- Sep 8, 2023
9eb556a
docker: deactivate netcdf support
program-- Sep 8, 2023
c9dc6d2
docker: disable sqlite for example run
program-- Sep 8, 2023
ba6c71e
cmake: only add geopackage if SQLite is enabled
program-- Sep 8, 2023
57135c1
cmake: UDUNITS2_FOUND only if library is found also
program-- Sep 8, 2023
47b9a48
cmake: changes per review
program-- Sep 8, 2023
4778e54
cmake: fix deprecated options scope
program-- Sep 8, 2023
96737ee
cmake: create targets in cmake modules instead of root cmakelists
program-- Sep 11, 2023
cc00b90
Add missing gmock dependency in individual test
PhilMiller Sep 15, 2023
2a273d3
cmake: update comments for clarity
program-- Sep 15, 2023
aaa5071
Add another missing dependence on gmock
PhilMiller Sep 15, 2023
f88b74b
cmake: fix FindNetCDF linkage
program-- Sep 15, 2023
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
5 changes: 5 additions & 0 deletions .github/actions/ngen-build/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ inputs:
required: false
description: 'Activate NetCDF Lumped Forcing Support'
default: 'ON'
use_sqlite:
required: false
description: 'Activate SQLite3 suppport for GeoPackage'
default: 'ON'
use_troute:
required: false
description: 'Enable t-route integration support'
Expand Down Expand Up @@ -176,6 +180,7 @@ runs:
-DBMI_FORTRAN_ACTIVE:BOOL=${{ inputs.bmi_fortran }} \
-DNGEN_ACTIVATE_ROUTING:BOOL=${{ inputs.use_troute }} \
-DNETCDF_ACTIVE:BOOL=${{ inputs.use_netcdf }} \
-DNGEN_WITH_SQLITE:BOOL=${{ inputs.use_sqlite }} \
-DMPI_ACTIVE:BOOL=${{ inputs.use_mpi }} -S .
mattw-nws marked this conversation as resolved.
Show resolved Hide resolved
echo "build-dir=$(echo ${{ inputs.build-dir }})" >> $GITHUB_OUTPUT
shell: bash
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@ CMakeCache.txt
/build
/cmake_build*

# Prevent ignoring cmake modules
!cmake/**/*.cmake

# Static Headers
include/bmi.hpp

Expand Down
Loading
Loading