Skip to content

Commit 53298b7

Browse files
committed
Update cmake exports to use single config file
1 parent 4679e90 commit 53298b7

File tree

12 files changed

+29
-137
lines changed

12 files changed

+29
-137
lines changed

CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,3 +137,9 @@ if (WITH_PETSC)
137137
find_package(PkgConfig REQUIRED)
138138
pkg_check_modules(PETSc REQUIRED IMPORTED_TARGET GLOBAL PETSc)
139139
endif()
140+
141+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/lasConfig.cmake.in
142+
${CMAKE_CURRENT_BINARY_DIR}/cmake/lasConfig.cmake @ONLY)
143+
144+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmake/lasConfig.cmake
145+
DESTINATION ${ConfigPackageLocation})

cmake/lasConfig.cmake.in

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
include(CMakeFindDependencyMacro)
2+
3+
4+
5+
if(@WITH_MPI@)
6+
find_dependency(MPI)
7+
endif()
8+
if(@WITH_PUMI@)
9+
find_dependency(SCOREC)
10+
endif()
11+
12+
include(${CMAKE_CURRENT_LIST_DIR}/las_las.cmake)
13+
# las_lascore.cmake needs to be included after las_las.cmake
14+
if(@WITH_PUMI@)
15+
include(${CMAKE_CURRENT_LIST_DIR}/las_lascore.cmake)
16+
endif()

core/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ endif()
3535
set_target_properties(las_core PROPERTIES PUBLIC_HEADER "${las_core_install}")
3636
target_include_directories(las_core PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<INSTALL_INTERFACE:include> ${include_dirs})
3737
target_link_libraries(las_core PUBLIC las SCOREC::apf ${link_libs})
38-
install(TARGETS las_core EXPORT las_coreConfig LIBRARY DESTINATION lib ARCHIVE DESTINATION lib PUBLIC_HEADER DESTINATION include)
39-
install(EXPORT las_coreConfig DESTINATION lib/cmake)
38+
install(TARGETS las_core EXPORT las_lascore LIBRARY DESTINATION lib ARCHIVE DESTINATION lib PUBLIC_HEADER DESTINATION include)
39+
install(EXPORT las_lascore DESTINATION ${ConfigPackageLocation} )

scripts/bgq-env.sh

Lines changed: 0 additions & 6 deletions
This file was deleted.

scripts/bgq-timing-batch.sh

Lines changed: 0 additions & 17 deletions
This file was deleted.

scripts/config.sh

Lines changed: 0 additions & 43 deletions
This file was deleted.

scripts/config_bgq.sh

Lines changed: 0 additions & 16 deletions
This file was deleted.

scripts/config_dcs.sh

Lines changed: 0 additions & 25 deletions
This file was deleted.

scripts/config_erp.sh

Lines changed: 0 additions & 16 deletions
This file was deleted.

scripts/timing-tests.sh

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)