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.

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

clean up hypre dependency install #244

Merged
merged 9 commits into from
Jun 5, 2020
Merged

clean up hypre dependency install #244

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d4e2195
clean up hypre dependency install
sslattery Jun 4, 2020
3df8694
Update cmake/CabanaConfig.cmakein
sslattery Jun 4, 2020
85a5dd6
set hypre variables before finding dependency
sslattery Jun 4, 2020
3d96232
only set hypre install variables if the user has not
sslattery Jun 4, 2020
40ae221
adding dependency enable options
sslattery Jun 4, 2020
517fbf8
Update CMakeLists.txt
junghans Jun 4, 2020
d877418
update FindHYPRE.cmake install dir
sslattery Jun 4, 2020
d1b9dae
Merge branch 'install_find_hypre' of github.com:sslattery/Cabana into…
sslattery Jun 4, 2020
a1a0401
Update CabanaConfig.cmakein
junghans Jun 4, 2020
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
14 changes: 14 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ Cabana_add_dependency( PACKAGE CLANG_FORMAT )

# find hypre
Cabana_add_dependency( PACKAGE HYPRE )
if(HYPRE_FOUND)
install(FILES
${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindHYPRE.cmake
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Cabana )
endif()

# find heffte
Cabana_add_dependency( PACKAGE Heffte )
Expand Down Expand Up @@ -174,6 +179,15 @@ endif()
configure_file(cmake/Cabana.pc.cmakein Cabana.pc @ONLY)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Cabana.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)

write_basic_package_version_file("CabanaConfigVersion.cmake"
VERSION ${PROJECT_VERSION} COMPATIBILITY ExactVersion)

configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/CabanaConfig.cmakein
${CMAKE_CURRENT_BINARY_DIR}/CabanaConfig.cmake @ONLY)

install(FILES "${CMAKE_CURRENT_BINARY_DIR}/CabanaConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/CabanaConfigVersion.cmake"
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Cabana)

##---------------------------------------------------------------------------##
## Clang Format
##---------------------------------------------------------------------------##
Expand Down
15 changes: 7 additions & 8 deletions core/src/CabanaConfig.cmakein → cmake/CabanaConfig.cmakein
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
include(CMakeFindDependencyMacro)
if(NOT DEFINED Kokkos_DIR)
set(Kokkos_DIR @Kokkos_DIR@)
endif()
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}" )
list(APPEND CMAKE_PREFIX_PATH @CMAKE_PREFIX_PATH@)
find_dependency(Kokkos REQUIRED)
set(Cabana_ENABLE_MPI @Cabana_ENABLE_MPI@)
if(@MPI_FOUND@)
find_dependency(MPI REQUIRED CXX)
set(Cabana_ENABLE_MPI ON)
endif()
if(@Cabana_ENABLE_ARBORX@)
find_dependency(ArborX REQUIRED)
set(Cabana_ENABLE_ARBORX ON)
endif()
set(Cabana_ENABLE_HYPRE @Cabana_ENABLE_HYPRE@)
if(@HYPRE_FOUND@)
find_dependency(HYPRE REQUIRED)
endif()
set(Cabana_ENABLE_HEFFTE @Cabana_ENABLE_HEFFTE@)
if(@HEFFTE_FOUND@)
find_dependency(Heffte REQUIRED)
endif()
set(Cabana_ENABLE_ARBORX @Cabana_ENABLE_ARBORX@)
if(@ARBORX_FOUND@)
find_dependency(ArborX REQUIRED)
endif()
include("${CMAKE_CURRENT_LIST_DIR}/CajitaTargets.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/Cabana_Targets.cmake")
9 changes: 0 additions & 9 deletions core/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,6 @@ install(EXPORT Cabana_Targets
NAMESPACE Cabana::
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Cabana)

install(FILES "${CMAKE_CURRENT_BINARY_DIR}/CabanaConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/CabanaConfigVersion.cmake"
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Cabana)

install(FILES ${HEADERS_PUBLIC} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})

install(FILES ${HEADERS_IMPL} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/impl/)
Expand All @@ -81,10 +78,4 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CabanaCore_config.hpp DESTINATION ${CM

include(CMakePackageConfigHelpers)

configure_file(CabanaConfig.cmakein
${CMAKE_CURRENT_BINARY_DIR}/CabanaConfig.cmake @ONLY)

write_basic_package_version_file("CabanaConfigVersion.cmake"
VERSION ${PROJECT_VERSION} COMPATIBILITY ExactVersion)

add_library(Cabana::cabanacore ALIAS cabanacore)