From 7e90d9df4c2408f309bccdf6192b9cea850993a4 Mon Sep 17 00:00:00 2001 From: Hariharan Devarajan Date: Mon, 7 Aug 2023 16:15:47 -0700 Subject: [PATCH] fixed release changes. --- CMake/cpp-logger-config.cmake.build.in | 9 +++------ CMake/cpp-logger-config.cmake.install.in | 9 +++------ CMakeLists.txt | 6 +++++- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/CMake/cpp-logger-config.cmake.build.in b/CMake/cpp-logger-config.cmake.build.in index a844b07..2e85c47 100644 --- a/CMake/cpp-logger-config.cmake.build.in +++ b/CMake/cpp-logger-config.cmake.build.in @@ -12,9 +12,6 @@ set(CPP_LOGGER_LIBRARY_PATH "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@") set(CPP_LOGGER_LIBRARIES "-L${CPP_LOGGER_LIBRARY_PATH} -lcpp-logger") #message(STATUS "CPP_LOGGER_LIBRARIES: " ${CPP_LOGGER_LIBRARIES}) set(CPP_LOGGER_DEFINITIONS "") -if (NOT TARGET cpp-logger::cpp-logger) - add_library(cpp-logger::cpp-logger ALIAS cpp-logger) - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(cpp-logger - REQUIRED_VARS CPP_LOGGER_FOUND CPP_LOGGER_INCLUDE_DIRS CPP_LOGGER_LIBRARIES) -endif () \ No newline at end of file +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(cpp-logger + REQUIRED_VARS CPP_LOGGER_FOUND CPP_LOGGER_INCLUDE_DIRS CPP_LOGGER_LIBRARIES) \ No newline at end of file diff --git a/CMake/cpp-logger-config.cmake.install.in b/CMake/cpp-logger-config.cmake.install.in index 3cde7dd..e53ea2c 100644 --- a/CMake/cpp-logger-config.cmake.install.in +++ b/CMake/cpp-logger-config.cmake.install.in @@ -12,9 +12,6 @@ set(CPP_LOGGER_LIBRARY_PATH "@CPP_LOGGER_INSTALL_LIB_DIR@") #message(STATUS "CPP_LOGGER_LIBRARY_PATH: " ${CPP_LOGGER_LIBRARY_PATH}) set(CPP_LOGGER_LIBRARIES "-L${CPP_LOGGER_LIBRARY_PATH} -lcpp-logger") set(CPP_LOGGER_DEFINITIONS "") -if (NOT TARGET cpp-logger::cpp-logger) - add_library(cpp-logger::cpp-logger ALIAS cpp-logger) - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(cpp-logger - REQUIRED_VARS CPP_LOGGER_FOUND CPP_LOGGER_INCLUDE_DIRS CPP_LOGGER_LIBRARIES) -endif () \ No newline at end of file +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(cpp-logger + REQUIRED_VARS CPP_LOGGER_FOUND CPP_LOGGER_INCLUDE_DIRS CPP_LOGGER_LIBRARIES) \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 6363411..4bd3361 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -146,9 +146,13 @@ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/CMake/${PROJECT_NAME}-config.cmake.build.in ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-config.cmake @ONLY ) +configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/CMake/${PROJECT_NAME}-config.cmake.install.in + ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/${PROJECT_NAME}/install/${PROJECT_NAME}-config.cmake @ONLY +) install( FILES - ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/${PROJECT_NAME}/${PROJECT_NAME}-config.cmake + ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/${PROJECT_NAME}/install/${PROJECT_NAME}-config.cmake DESTINATION ${CPP_LOGGER_INSTALL_LIB_DIR}/cmake/${PROJECT_NAME} )