CMake package config (shibatch#412)

* Use variables from GNUInstallDirs everywhere * Componentize the install rules * Add headers to the interface include path * Add install rules for CMake package config * Associate inline headers to a target Previously inline_headers was a UTILITY target, which cannot be installed, so it was renamed to inline_headers_util and a new inline_headers INTERFACE library target is introduced instead. Co-authored-by: friendlyanon <[email protected]>
blapie · Mar 12, 2021 · eb3d977 · eb3d977
1 parent cc7776a
commit eb3d977
Show file tree

Hide file tree

Showing 5 changed files with 189 additions and 31 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -231,6 +231,36 @@ set(TARGET_LIBDFT "sleefdft")
 # Check subdirectories
 add_subdirectory("src")
 
+# Install the CMake package config
+include(CMakePackageConfigHelpers)
+
+write_basic_package_version_file(
+    sleefConfigVersion.cmake
+    COMPATIBILITY SameMajorVersion
+)
+
+set(
+    SLEEF_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/sleef"
+    CACHE STRING "CMake package config location relative to the install prefix"
+)
+
+mark_as_advanced(SLEEF_INSTALL_CMAKEDIR)
+
+install(
+    FILES
+    "${PROJECT_SOURCE_DIR}/sleefConfig.cmake"
+    "${PROJECT_BINARY_DIR}/sleefConfigVersion.cmake"
+    DESTINATION "${SLEEF_INSTALL_CMAKEDIR}"
+    COMPONENT sleef_Development
+)
+
+install(
+    EXPORT sleefTargets
+    NAMESPACE sleef::
+    DESTINATION "${SLEEF_INSTALL_CMAKEDIR}"
+    COMPONENT sleef_Development
+)
+
 # Extra messages at configuration time. By default is active, it can be
 # turned off by invoking cmake with "-DSLEEF_SHOW_CONFIG=OFF".
 if(SLEEF_SHOW_CONFIG)

diff --git a/sleefConfig.cmake b/sleefConfig.cmake
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/sleefTargets.cmake")
diff --git a/src/dft/CMakeLists.txt b/src/dft/CMakeLists.txt
@@ -354,9 +354,30 @@ set_target_properties(${TARGET_LIBDFT} PROPERTIES
   ) 
 
 # Install
-install(TARGETS ${TARGET_LIBDFT}
-        PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-        LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-        ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-        RUNTIME DESTINATION bin
+install(
+    TARGETS ${TARGET_LIBDFT}
+    EXPORT sleefTargets
+    PUBLIC_HEADER #
+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+    COMPONENT sleef_Development
+    LIBRARY #
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+    COMPONENT sleef_Runtime
+    NAMELINK_SKIP
+    ARCHIVE #
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+    COMPONENT sleef_Development
+    RUNTIME #
+    DESTINATION "${CMAKE_INSTALL_BINDIR}"
+    COMPONENT sleef_Runtime
+    INCLUDES #
+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+)
+
+install(
+    TARGETS ${TARGET_LIBDFT}
+    LIBRARY #
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+    COMPONENT sleef_Development
+    NAMELINK_ONLY
 )
diff --git a/src/libm/CMakeLists.txt b/src/libm/CMakeLists.txt
@@ -641,11 +641,31 @@ if(BUILD_INLINE_HEADERS)
 
     #
 
-    add_custom_target(${TARGET_INLINE_HEADERS} ALL
+    add_custom_target(${TARGET_INLINE_HEADERS}_util ALL
       DEPENDS
       ${INLINE_HEADER_FILES_GENERATED}
       )
-    install(FILES ${INLINE_HEADER_FILES_GENERATED} DESTINATION include)
+
+    add_library("${TARGET_INLINE_HEADERS}" INTERFACE)
+    add_dependencies("${TARGET_INLINE_HEADERS}" "${TARGET_INLINE_HEADERS}_util")
+    target_include_directories(
+        "${TARGET_INLINE_HEADERS}"
+        INTERFACE
+        "$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>"
+    )
+
+    # CMake 3.4 can't have PUBLIC_HEADER property on INTERFACE libraries
+    install(
+        FILES ${INLINE_HEADER_FILES_GENERATED}
+        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+        COMPONENT sleef_Development
+    )
+
+    install(
+        TARGETS "${TARGET_INLINE_HEADERS}"
+        EXPORT sleefTargets
+        INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+    )
   endif(SED_COMMAND)
 endif(BUILD_INLINE_HEADERS)
 
@@ -966,7 +986,11 @@ if(CLANG_EXE_PATH AND SLEEF_ENABLE_LLVM_BITCODE)
   )
   add_dependencies(${TARGET_LLVM_BITCODE} ${TARGET_HEADERS})
 
-  install(FILES ${LLVM_BITCODE_OUTPUTS} DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+  install(
+      FILES ${LLVM_BITCODE_OUTPUTS}
+      DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+      COMPONENT sleef_Development
+  )
 endif()
 
 # --------------------------------------------------------------------
@@ -992,31 +1016,88 @@ if(COMPILER_SUPPORTS_BUILTIN_MATH)
 endif()
 
 if(BUILD_SCALAR_LIB)
-  install(TARGETS sleefscalar
-          LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-          ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-          RUNTIME DESTINATION bin
-          )
+  install(
+      TARGETS sleefscalar
+      EXPORT sleefTargets
+      LIBRARY #
+      DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+      COMPONENT sleef_Runtime
+      NAMELINK_SKIP
+      ARCHIVE #
+      DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+      COMPONENT sleef_Development
+      RUNTIME #
+      DESTINATION "${CMAKE_INSTALL_BINDIR}"
+      COMPONENT sleef_Runtime
+  )
+
+  install(
+      TARGETS sleefscalar
+      LIBRARY #
+      DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+      COMPONENT sleef_Development
+      NAMELINK_ONLY
+  )
 endif()
 
 # --------------------------------------------------------------------
 # Install
 # --------------------------------------------------------------------
 # Install libsleef and sleef.h
-install(TARGETS ${TARGET_LIBSLEEF}
-        PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-        LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-        ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-        RUNTIME DESTINATION bin
+install(
+    TARGETS ${TARGET_LIBSLEEF}
+    EXPORT sleefTargets
+    PUBLIC_HEADER #
+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+    COMPONENT sleef_Development
+    LIBRARY #
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+    COMPONENT sleef_Runtime
+    NAMELINK_SKIP
+    ARCHIVE #
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+    COMPONENT sleef_Development
+    RUNTIME #
+    DESTINATION "${CMAKE_INSTALL_BINDIR}"
+    COMPONENT sleef_Runtime
+    INCLUDES #
+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+)
+install(
+    TARGETS ${TARGET_LIBSLEEF}
+    LIBRARY #
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+    COMPONENT sleef_Development
+    NAMELINK_ONLY
 )
 configure_file("sleef.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/sleef.pc" @ONLY)
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sleef.pc"
-        DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+install(
+    FILES "${CMAKE_CURRENT_BINARY_DIR}/sleef.pc"
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
+    COMPONENT sleef_Development
+)
 
 if(ENABLE_GNUABI)
-  install(TARGETS ${TARGET_LIBSLEEFGNUABI}
-          LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-          ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-          RUNTIME DESTINATION bin
-          )
+  install(
+      TARGETS ${TARGET_LIBSLEEFGNUABI}
+      EXPORT sleefTargets
+      LIBRARY #
+      DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+      COMPONENT sleef_Runtime
+      NAMELINK_SKIP
+      ARCHIVE #
+      DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+      COMPONENT sleef_Development
+      RUNTIME #
+      DESTINATION "${CMAKE_INSTALL_BINDIR}"
+      COMPONENT sleef_Runtime
+  )
+
+  install(
+      TARGETS ${TARGET_LIBSLEEF}
+      LIBRARY #
+      DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+      COMPONENT sleef_Development
+      NAMELINK_ONLY
+  )
 endif()
diff --git a/src/quad/CMakeLists.txt b/src/quad/CMakeLists.txt
@@ -393,7 +393,11 @@ if(BUILD_INLINE_HEADERS)
       DEPENDS
       ${INLINE_HEADER_FILES_GENERATED}
       )
-    install(FILES ${INLINE_HEADER_FILES_GENERATED} DESTINATION include)
+    install(
+        FILES ${INLINE_HEADER_FILES_GENERATED}
+        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+        COMPONENT sleef_Development
+    )
   endif(SED_COMMAND)
 endif(BUILD_INLINE_HEADERS)
 
@@ -485,9 +489,30 @@ endif(DEFINED QMKDISP_PARAMS_X2)
 # Install
 # --------------------------------------------------------------------
 # Install libsleef and sleef.h
-install(TARGETS sleefquad
-        PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-        LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-        ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-        RUNTIME DESTINATION bin
+install(
+    TARGETS sleefquad
+    EXPORT sleefTargets
+    PUBLIC_HEADER #
+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+    COMPONENT sleef_Development
+    LIBRARY #
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+    COMPONENT sleef_Runtime
+    NAMELINK_SKIP
+    ARCHIVE #
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+    COMPONENT sleef_Development
+    RUNTIME #
+    DESTINATION "${CMAKE_INSTALL_BINDIR}"
+    COMPONENT sleef_Runtime
+    INCLUDES #
+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+)
+
+install(
+    TARGETS sleefquad
+    LIBRARY #
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+    COMPONENT sleef_Development
+    NAMELINK_ONLY
 )
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		include("${CMAKE_CURRENT_LIST_DIR}/sleefTargets.cmake")