From 9e0ffc4fe812bfbae312176855d1aaf395c786e2 Mon Sep 17 00:00:00 2001 From: imdeaddev Date: Tue, 9 Dec 2025 23:43:14 +0300 Subject: [PATCH 1/2] installation fix --- .gitignore | 2 ++ CMakeLists.txt | 29 +++++++++++++++++------------ cmake/DeadDevBitmaskConfig.cmake.in | 5 +++++ 3 files changed, 24 insertions(+), 12 deletions(-) create mode 100644 cmake/DeadDevBitmaskConfig.cmake.in diff --git a/.gitignore b/.gitignore index e17c872..f20ee16 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ * +!cmake/ +!cmake/** !.github/ !.github/** !example/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 223cc70..3b63f24 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.23..3.30) -project("DeadDev Bitmask" LANGUAGES CXX VERSION 1.0.0) +project("DeadDevBitmask" LANGUAGES CXX VERSION 1.0.0) cmake_policy(SET CMP0135 NEW) message(STATUS "${CMAKE_PROJECT_NAME} v${CMAKE_PROJECT_VERSION}") @@ -26,17 +26,23 @@ add_library(deaddev::bitmask ALIAS bitmask) if(DEADDEV_BITMASK_INSTALL) include(GNUInstallDirs) - target_sources(bitmask - INTERFACE FILE_SET HEADERS - BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include - FILES ${CMAKE_INSTALL_INCLUDEDIR}/deaddev/bitmask.hpp) - install(TARGETS bitmask - EXPORT bitmask_targets - FILE_SET HEADERS DESTINATION ./include) - install(EXPORT bitmask_targets - FILE deaddedvBitmaskConfig.cmake + include(CMakePackageConfigHelpers) + install(TARGETS bitmask EXPORT ${PROJECT_NAME}Targets) + install(EXPORT ${PROJECT_NAME}Targets NAMESPACE deaddev:: - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/deaddev) + DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") + configure_package_config_file( + cmake/deadDevBitmaskConfig.cmake.in + "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" + INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" + ) + install(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" + DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" + ) + install(DIRECTORY include/deaddev + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.hpp") endif(DEADDEV_BITMASK_INSTALL) if(DEADDEV_BITMASK_GENERATE_DOCS) @@ -64,4 +70,3 @@ endif(DEADDEV_BITMASK_BUILD_TESTS) if(DEADDEV_BITMASK_BUILD_EXAMPLES) add_subdirectory(example) endif(DEADDEV_BITMASK_BUILD_EXAMPLES) - diff --git a/cmake/DeadDevBitmaskConfig.cmake.in b/cmake/DeadDevBitmaskConfig.cmake.in new file mode 100644 index 0000000..dce0409 --- /dev/null +++ b/cmake/DeadDevBitmaskConfig.cmake.in @@ -0,0 +1,5 @@ +@PACKAGE_INIT@ + +include("${CMAKE_INSTALL_PREFIX}/lib/cmake/@PROJECT_NAME@/@PROJECT_NAME@Targets.cmake") +check_required_components("@PROJECT_NAME@") +message(STATUS "Found @PROJECT_NAME@ v@PROJECT_VERSION@") \ No newline at end of file From 6623fe5531d9fe336986c47d5db16361600879f4 Mon Sep 17 00:00:00 2001 From: imdeaddev Date: Tue, 9 Dec 2025 23:47:28 +0300 Subject: [PATCH 2/2] fixed typo --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b63f24..1a7d927 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,7 @@ if(DEADDEV_BITMASK_INSTALL) NAMESPACE deaddev:: DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") configure_package_config_file( - cmake/deadDevBitmaskConfig.cmake.in + cmake/DeadDevBitmaskConfig.cmake.in "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" )