From 2fa3369931f3def599244cae00c5029581bd4121 Mon Sep 17 00:00:00 2001 From: Hariharan Devarajan Date: Wed, 9 Aug 2023 07:48:45 -0700 Subject: [PATCH 1/6] improve linking of cpp-logger --- CMake/cpp-logger-config.cmake.build.in | 3 ++- CMake/cpp-logger-config.cmake.install.in | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMake/cpp-logger-config.cmake.build.in b/CMake/cpp-logger-config.cmake.build.in index 2e85c47..229a646 100644 --- a/CMake/cpp-logger-config.cmake.build.in +++ b/CMake/cpp-logger-config.cmake.build.in @@ -9,7 +9,8 @@ endif () get_filename_component(CPP_LOGGER_ROOT_DIR ${CPP_LOGGER_INCLUDE_DIRS}/.. ABSOLUTE) #message(STATUS "CPP_LOGGER_ROOT_DIR: " ${CPP_LOGGER_ROOT_DIR}) set(CPP_LOGGER_LIBRARY_PATH "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@") -set(CPP_LOGGER_LIBRARIES "-L${CPP_LOGGER_LIBRARY_PATH} -lcpp-logger") +target_link_directories(${CPP_LOGGER_LIBRARY_PATH}) +set(CPP_LOGGER_LIBRARIES cpp-logger) #message(STATUS "CPP_LOGGER_LIBRARIES: " ${CPP_LOGGER_LIBRARIES}) set(CPP_LOGGER_DEFINITIONS "") include(FindPackageHandleStandardArgs) diff --git a/CMake/cpp-logger-config.cmake.install.in b/CMake/cpp-logger-config.cmake.install.in index e53ea2c..fc151fc 100644 --- a/CMake/cpp-logger-config.cmake.install.in +++ b/CMake/cpp-logger-config.cmake.install.in @@ -9,8 +9,9 @@ endif () get_filename_component(CPP_LOGGER_ROOT_DIR ${CPP_LOGGER_INCLUDE_DIRS}/.. ABSOLUTE) #message(STATUS "CPP_LOGGER_ROOT_DIR: " ${CPP_LOGGER_ROOT_DIR}) set(CPP_LOGGER_LIBRARY_PATH "@CPP_LOGGER_INSTALL_LIB_DIR@") +target_link_directories(${CPP_LOGGER_LIBRARY_PATH}) #message(STATUS "CPP_LOGGER_LIBRARY_PATH: " ${CPP_LOGGER_LIBRARY_PATH}) -set(CPP_LOGGER_LIBRARIES "-L${CPP_LOGGER_LIBRARY_PATH} -lcpp-logger") +set(CPP_LOGGER_LIBRARIES cpp-logger) set(CPP_LOGGER_DEFINITIONS "") include(FindPackageHandleStandardArgs) find_package_handle_standard_args(cpp-logger From 8102ba072bfd8ebace1bb564f3d507df7e45a7e9 Mon Sep 17 00:00:00 2001 From: Hariharan Devarajan Date: Wed, 9 Aug 2023 14:38:10 -0600 Subject: [PATCH 2/6] Update cpp-logger-config.cmake.build.in --- CMake/cpp-logger-config.cmake.build.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMake/cpp-logger-config.cmake.build.in b/CMake/cpp-logger-config.cmake.build.in index 229a646..e64e9aa 100644 --- a/CMake/cpp-logger-config.cmake.build.in +++ b/CMake/cpp-logger-config.cmake.build.in @@ -9,10 +9,10 @@ endif () get_filename_component(CPP_LOGGER_ROOT_DIR ${CPP_LOGGER_INCLUDE_DIRS}/.. ABSOLUTE) #message(STATUS "CPP_LOGGER_ROOT_DIR: " ${CPP_LOGGER_ROOT_DIR}) set(CPP_LOGGER_LIBRARY_PATH "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@") -target_link_directories(${CPP_LOGGER_LIBRARY_PATH}) +link_directories(${CPP_LOGGER_LIBRARY_PATH}) set(CPP_LOGGER_LIBRARIES cpp-logger) #message(STATUS "CPP_LOGGER_LIBRARIES: " ${CPP_LOGGER_LIBRARIES}) set(CPP_LOGGER_DEFINITIONS "") 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 + REQUIRED_VARS CPP_LOGGER_FOUND CPP_LOGGER_INCLUDE_DIRS CPP_LOGGER_LIBRARIES) From 9a54127e750eea9dd5eb2cb7396d7d35c0d0426b Mon Sep 17 00:00:00 2001 From: Hariharan Devarajan Date: Wed, 9 Aug 2023 14:38:39 -0600 Subject: [PATCH 3/6] Update cpp-logger-config.cmake.install.in --- CMake/cpp-logger-config.cmake.install.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMake/cpp-logger-config.cmake.install.in b/CMake/cpp-logger-config.cmake.install.in index fc151fc..d32e392 100644 --- a/CMake/cpp-logger-config.cmake.install.in +++ b/CMake/cpp-logger-config.cmake.install.in @@ -9,10 +9,10 @@ endif () get_filename_component(CPP_LOGGER_ROOT_DIR ${CPP_LOGGER_INCLUDE_DIRS}/.. ABSOLUTE) #message(STATUS "CPP_LOGGER_ROOT_DIR: " ${CPP_LOGGER_ROOT_DIR}) set(CPP_LOGGER_LIBRARY_PATH "@CPP_LOGGER_INSTALL_LIB_DIR@") -target_link_directories(${CPP_LOGGER_LIBRARY_PATH}) +link_directories(${CPP_LOGGER_LIBRARY_PATH}) #message(STATUS "CPP_LOGGER_LIBRARY_PATH: " ${CPP_LOGGER_LIBRARY_PATH}) set(CPP_LOGGER_LIBRARIES cpp-logger) set(CPP_LOGGER_DEFINITIONS "") 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 + REQUIRED_VARS CPP_LOGGER_FOUND CPP_LOGGER_INCLUDE_DIRS CPP_LOGGER_LIBRARIES) From a188af5a5526064893f68ce16444a8ee61a46944 Mon Sep 17 00:00:00 2001 From: Hariharan Devarajan Date: Wed, 9 Aug 2023 14:13:27 -0700 Subject: [PATCH 4/6] improve linking of cpp-logger --- CMake/cpp-logger-config.cmake.build.in | 4 ++++ CMake/cpp-logger-config.cmake.install.in | 3 +++ 2 files changed, 7 insertions(+) diff --git a/CMake/cpp-logger-config.cmake.build.in b/CMake/cpp-logger-config.cmake.build.in index 229a646..3b74ac4 100644 --- a/CMake/cpp-logger-config.cmake.build.in +++ b/CMake/cpp-logger-config.cmake.build.in @@ -13,6 +13,10 @@ target_link_directories(${CPP_LOGGER_LIBRARY_PATH}) set(CPP_LOGGER_LIBRARIES cpp-logger) #message(STATUS "CPP_LOGGER_LIBRARIES: " ${CPP_LOGGER_LIBRARIES}) set(CPP_LOGGER_DEFINITIONS "") + +if (NOT TARGET cpp-logger) + include(${CMAKE_CURRENT_LIST_DIR}/cpp-loggerTargets.cmake) +endif() 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 fc151fc..d2ab23a 100644 --- a/CMake/cpp-logger-config.cmake.install.in +++ b/CMake/cpp-logger-config.cmake.install.in @@ -13,6 +13,9 @@ target_link_directories(${CPP_LOGGER_LIBRARY_PATH}) #message(STATUS "CPP_LOGGER_LIBRARY_PATH: " ${CPP_LOGGER_LIBRARY_PATH}) set(CPP_LOGGER_LIBRARIES cpp-logger) set(CPP_LOGGER_DEFINITIONS "") +if (NOT TARGET cpp-logger) + include(${CMAKE_CURRENT_LIST_DIR}/cpp-loggerTargets.cmake) +endif() 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 From 8b74b46748faf9dbf6fcc00a392aa29b2840cac2 Mon Sep 17 00:00:00 2001 From: Hariharan Devarajan Date: Wed, 9 Aug 2023 14:16:40 -0700 Subject: [PATCH 5/6] improve linking of cpp-logger --- CMake/cpp-logger-config.cmake.install.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMake/cpp-logger-config.cmake.install.in b/CMake/cpp-logger-config.cmake.install.in index e1e886b..0ccb8f4 100644 --- a/CMake/cpp-logger-config.cmake.install.in +++ b/CMake/cpp-logger-config.cmake.install.in @@ -14,7 +14,7 @@ link_directories(${CPP_LOGGER_LIBRARY_PATH}) set(CPP_LOGGER_LIBRARIES cpp-logger) set(CPP_LOGGER_DEFINITIONS "") if (NOT TARGET cpp-logger) - include(${CMAKE_CURRENT_LIST_DIR}/cpp-loggerTargets.cmake) + include(${CMAKE_CURRENT_LIST_DIR}/cpp-logger-targets.cmake) endif() include(FindPackageHandleStandardArgs) find_package_handle_standard_args(cpp-logger From b3fb2259064193e34a93e0c4064c51d9e991c26a Mon Sep 17 00:00:00 2001 From: Hariharan Devarajan Date: Wed, 9 Aug 2023 14:19:59 -0700 Subject: [PATCH 6/6] improve linking of cpp-logger --- CMake/cpp-logger-config.cmake.build.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMake/cpp-logger-config.cmake.build.in b/CMake/cpp-logger-config.cmake.build.in index 90fe6e3..eb3582a 100644 --- a/CMake/cpp-logger-config.cmake.build.in +++ b/CMake/cpp-logger-config.cmake.build.in @@ -15,7 +15,7 @@ set(CPP_LOGGER_LIBRARIES cpp-logger) set(CPP_LOGGER_DEFINITIONS "") if (NOT TARGET cpp-logger) - include(${CMAKE_CURRENT_LIST_DIR}/cpp-loggerTargets.cmake) + include(${CMAKE_CURRENT_LIST_DIR}/cpp-logger-targets.cmake) endif() include(FindPackageHandleStandardArgs) find_package_handle_standard_args(cpp-logger