Skip to content

Review ebourne cleanup cmake #234

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
EmilyBourne merged 3 commits into from
Apr 30, 2026
Merged

Review ebourne cleanup cmake #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c88f67
Assume semver for Kokkos
tpadioleau Apr 30, 2026
952eeb6
Update GMGPolarConfig
tpadioleau Apr 30, 2026
167cb8e
Add cxx_std_20 on the interface of cmake targets
tpadioleau Apr 30, 2026
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ if(GMGPOLAR_ENABLE_COVERAGE)
endif()

find_package(OpenMP REQUIRED COMPONENTS CXX)
find_package(Kokkos 4.4.1...<5.1 QUIET REQUIRED)
find_package(Kokkos 4.4.1...<6 QUIET REQUIRED)

if(GMGPOLAR_USE_MUMPS)
find_package(MUMPS REQUIRED COMPONENTS OpenMP METIS)
Expand Down
8 changes: 4 additions & 4 deletions cmake/GMGPolarConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")

include(CMakeFindDependencyMacro)

find_dependency(OpenMP REQUIRED)
find_dependency(Kokkos REQUIRED)
find_dependency(OpenMP COMPONENTS CXX)
find_dependency(Kokkos)

if(@GMGPOLAR_USE_MUMPS@)
find_dependency(MUMPS REQUIRED)
find_dependency(MUMPS COMPONENTS OpenMP METIS)
endif()

if(@GMGPOLAR_USE_LIKWID@)
find_dependency(LIKWID REQUIRED)
find_dependency(LIKWID)
endif()

include("${CMAKE_CURRENT_LIST_DIR}/GMGPolarTargets.cmake")
5 changes: 5 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ add_library(GMGPolarLib STATIC
${INTERPOLATION_SOURCES}
)

# Declare C++20 is a minimum required to use GMGPolarLib headers
target_compile_features(GMGPolarLib INTERFACE cxx_std_20)

# Basic library configuration
target_include_directories(GMGPolarLib PUBLIC
${GMGPOLAR_INCLUDE_DIRS}
Expand Down Expand Up @@ -82,6 +85,8 @@ add_library(GMGPolar::GMGPolarLib ALIAS GMGPolarLib)
add_library(GMGPolarInterface STATIC
${CONFIG_PARSER_SOURCES}
)
# Declare C++20 is a minimum required to use GMGPolarInterface headers
target_compile_features(GMGPolarInterface INTERFACE cxx_std_20)
target_link_libraries(GMGPolarInterface
PUBLIC
GMGPolarLib
Expand Down
Loading