From 814c62aac6e291ebba0ae7a55d8f6003195f0f03 Mon Sep 17 00:00:00 2001
From: Andrea Pappacoda <andrea@pappacoda.it>
Date: Sat, 30 Jul 2022 00:50:45 +0200
Subject: [PATCH] build: minor tweaks
With this patch I've made a few minor changes to CMake configuration:
- CMake config files are now installed to share/ (CMAKE_INSTALL_DATADIR)
instead of lib/, as cpp-jwt is header-only, thus arch-independent.
- Headers are now installed to CMAKE_INSTALL_INCLUDEDIR instead of the
hardcoded include/
- I've removed a few redundant options from the install(TARGETS) call,
as they are implied by default since CMake 3.14.
---
CMakeLists.txt | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e56f73..bd1f2a7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,21 +76,16 @@ endif()
include(GNUInstallDirs)
include(CMakePackageConfigHelpers)
-set(CPP_JWT_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
+set(CPP_JWT_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME})
-install(
- TARGETS ${PROJECT_NAME}
- EXPORT ${PROJECT_NAME}Targets
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets)
install(
EXPORT ${PROJECT_NAME}Targets
DESTINATION ${CPP_JWT_CONFIG_INSTALL_DIR}
NAMESPACE ${PROJECT_NAME}::
COMPONENT dev)
configure_package_config_file(cmake/Config.cmake.in ${PROJECT_NAME}Config.cmake
- INSTALL_DESTINATION ${CPP_JWT_CONFIG_INSTALL_DIR}
+ INSTALL_DESTINATION ${CPP_JWT_CONFIG_INSTALL_DIR}
NO_SET_AND_CHECK_MACRO)
write_basic_package_version_file(${PROJECT_NAME}ConfigVersion.cmake
COMPATIBILITY SameMajorVersion
@@ -106,7 +101,7 @@ if(NOT CPP_JWT_USE_VENDORED_NLOHMANN_JSON)
endif()
install(
DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/jwt/
- DESTINATION include/jwt
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jwt
COMPONENT dev
FILES_MATCHING
PATTERN "*.hpp"