Skip to content

Cmake fix from master #3152

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.

Sign up for GitHub

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

Merged
oparry-ukaea merged 4 commits into from
Jul 28, 2025
Merged

Cmake fix from master #3152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd146a8
Update CMakeLists.txt
tbody-cfs Apr 17, 2025
5988480
Move enable C to NetCDF
tbody-cfs Apr 18, 2025
0f7c854
Remove top-level C
tbody-cfs Apr 18, 2025
0ab77ba
Add back in C language for SUNDIALS
tbody-cfs Apr 18, 2025
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
1 change: 1 addition & 0 deletions cmake/FindnetCDF.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ if (NOT netCDF_ROOT AND EXISTS "${BOUT_USE_NETCDF}")
set(netCDF_ROOT "${BOUT_USE_NETCDF}")
endif()

enable_language(C)
find_package(netCDF QUIET CONFIG)

if (netCDF_FOUND)
Expand Down
2 changes: 1 addition & 1 deletion cmake/SetupBOUTThirdParty.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@ option(BOUT_DOWNLOAD_SUNDIALS "Download and build SUNDIALS" OFF)
cmake_dependent_option(BOUT_USE_SUNDIALS "Enable support for SUNDIALS time solvers" OFF
"NOT BOUT_DOWNLOAD_SUNDIALS" ON)
if (BOUT_USE_SUNDIALS)
enable_language(C)
if (BOUT_DOWNLOAD_SUNDIALS)
message(STATUS "Downloading and configuring SUNDIALS")
include(FetchContent)
Expand All @@ -293,7 +294,6 @@ if (BOUT_USE_SUNDIALS)
FetchContent_MakeAvailable(sundials)
message(STATUS "SUNDIALS done configuring")
else()
enable_language(C)
find_package(SUNDIALS REQUIRED)
if (SUNDIALS_VERSION VERSION_LESS 4.0.0)
message(FATAL_ERROR "SUNDIALS_VERSION 4.0.0 or newer is required. Found version ${SUNDIALS_VERSION}.")
Expand Down
Loading