Skip to content

Improve packageability of install and install gdb pretty-printer #1502

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
upsj merged 5 commits into from
Dec 11, 2023
Merged

Improve packageability of install and install gdb pretty-printer #1502

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a0c34e3
allow installing gdb pretty-printer to be auto-loaded
upsj Dec 8, 2023
4813cad
copy pretty-printer to build directory
upsj Dec 8, 2023
847ced0
install pretty-printers only for shared linux builds
upsj Dec 9, 2023
75777b4
separate installed components into runtime and development
upsj Dec 9, 2023
fda7259
review updates
upsj Dec 11, 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
Prev Previous commit
review updates 
- install symlinks only for development (NAMELINK_COMPONENT)
- better formatting

Co-authored-by: Pratik Nayak <pratik.nayak@kit.edu>
  • Loading branch information
@upsj @pratikvn
upsj and pratikvn committed Dec 11, 2023
commit fda7259d8aff45f77d5ba32f58cefc48b362658a
33 changes: 17 additions & 16 deletions cmake/install_helpers.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,15 @@ function(ginkgo_install_library name)
install(TARGETS "${name}"
EXPORT Ginkgo
LIBRARY
DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
COMPONENT Runtime
DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
COMPONENT Ginkgo_Runtime
NAMELINK_COMPONENT Ginkgo_Development
RUNTIME
DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}"
COMPONENT Runtime
DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}"
COMPONENT Ginkgo_Runtime
ARCHIVE
DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
COMPONENT Development
DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
COMPONENT Ginkgo_Development
)
endfunction()

Expand All @@ -63,41 +64,41 @@ function(ginkgo_install)
install(FILES ${Ginkgo_BINARY_DIR}/ginkgo_$<CONFIG>.pc
DESTINATION "${GINKGO_INSTALL_PKGCONFIG_DIR}"
RENAME ginkgo.pc
COMPONENT Development)
COMPONENT Ginkgo_Development)

# install the public header files
install(DIRECTORY "${Ginkgo_SOURCE_DIR}/include/"
DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
COMPONENT Development
COMPONENT Ginkgo_Development
FILES_MATCHING PATTERN "*.hpp"
)
install(FILES "${Ginkgo_BINARY_DIR}/include/ginkgo/config.hpp"
DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/ginkgo"
COMPONENT Development
COMPONENT Ginkgo_Development
)

if (GINKGO_HAVE_HWLOC AND NOT HWLOC_FOUND)
get_filename_component(HWLOC_LIB_PATH ${HWLOC_LIBRARIES} DIRECTORY)
file(GLOB HWLOC_LIBS "${HWLOC_LIB_PATH}/libhwloc*")
install(FILES ${HWLOC_LIBS}
DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
COMPONENT Runtime
COMPONENT Ginkgo_Runtime
)
# We only use hwloc and not netloc
install(DIRECTORY "${HWLOC_INCLUDE_DIRS}/hwloc"
DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
COMPONENT Development
COMPONENT Ginkgo_Development
)
install(FILES "${HWLOC_INCLUDE_DIRS}/hwloc.h"
DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}"
COMPONENT Development
COMPONENT Ginkgo_Development
)
endif()

# Install CMake modules
install(DIRECTORY "${Ginkgo_SOURCE_DIR}/cmake/Modules/"
DESTINATION "${GINKGO_INSTALL_MODULE_DIR}"
COMPONENT Development
COMPONENT Ginkgo_Development
FILES_MATCHING PATTERN "*.cmake"
)

Expand All @@ -117,12 +118,12 @@ function(ginkgo_install)
"${Ginkgo_BINARY_DIR}/GinkgoConfig.cmake"
"${Ginkgo_BINARY_DIR}/GinkgoConfigVersion.cmake"
DESTINATION "${GINKGO_INSTALL_CONFIG_DIR}"
COMPONENT Development)
COMPONENT Ginkgo_Development)
install(EXPORT Ginkgo
NAMESPACE Ginkgo::
FILE GinkgoTargets.cmake
DESTINATION "${GINKGO_INSTALL_CONFIG_DIR}"
COMPONENT Development)
COMPONENT Ginkgo_Development)

# Export package for use from the build tree
if (GINKGO_EXPORT_BUILD_DIR)
Expand All @@ -134,6 +135,6 @@ function(ginkgo_install)
"${Ginkgo_SOURCE_DIR}/dev_tools/scripts/gdb-ginkgo.py"
DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
RENAME "$<TARGET_FILE_NAME:ginkgo>-gdb.py"
COMPONENT Development)
COMPONENT Ginkgo_Development)
endif()
endfunction()