From 67357b846205e36eba5c277a288beefe4f3bea52 Mon Sep 17 00:00:00 2001 From: ToKiNoBug Date: Wed, 25 Oct 2023 14:05:18 +0800 Subject: [PATCH 1/3] ignore CLion files --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 9dc07073..286544f3 100644 --- a/.gitignore +++ b/.gitignore @@ -173,6 +173,9 @@ compile_commands.json .clangd/ .cache/ +# CLion/IDEA files +.idea/ + # Project files bin/ external/boost/ From 5f531506dc9c5fbea1b9e0eab1c58dff25d42c36 Mon Sep 17 00:00:00 2001 From: ToKiNoBug Date: Wed, 25 Oct 2023 14:08:40 +0800 Subject: [PATCH 2/3] generate missing komputeConfigVersion.cmake to fix issue #324 --- src/CMakeLists.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dbb47dbe..b38e30d6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -43,6 +43,14 @@ configure_package_config_file(${PROJECT_SOURCE_DIR}/cmake/komputeConfig.cmake.in "${PROJECT_BINARY_DIR}/kompute/komputeConfig.cmake" INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/kompute) +# Generated komputeConfigVersion.cmake that is required in the following install command +# This will fix issue #324 +write_basic_package_version_file( + "${PROJECT_BINARY_DIR}/kompute/komputeConfigVersion.cmake" + VERSION ${CMAKE_PROJECT_VERSION} + COMPATIBILITY AnyNewerVersion # Other possible values: SameMajorVersion, SameMinorVersion, ExactVersion +) + install(FILES ${PROJECT_BINARY_DIR}/kompute/komputeConfig.cmake ${PROJECT_BINARY_DIR}/kompute/komputeConfigVersion.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/kompute) From 8ea8cd226df82716f57f65651bcb24b9e12e63f5 Mon Sep 17 00:00:00 2001 From: ToKiNoBug Date: Wed, 25 Oct 2023 14:37:59 +0800 Subject: [PATCH 3/3] fix installing kompute/logger header files --- src/include/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/include/CMakeLists.txt b/src/include/CMakeLists.txt index e1652fdd..e8aea8bf 100644 --- a/src/include/CMakeLists.txt +++ b/src/include/CMakeLists.txt @@ -41,4 +41,7 @@ target_sources(kp_logger PRIVATE kompute/logger/Logger.hpp ) -install(DIRECTORY logger DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) \ No newline at end of file +# This installation requires non-existing dir logger, +# but previous installation at line 30 has already installed kompute/logger +# This will cause an error during installation +# install(DIRECTORY logger DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) \ No newline at end of file