Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions CMake/cpp-logger-config.cmake.build.in
Original file line number Diff line number Diff line change
Expand Up @@ -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 ()
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(cpp-logger
REQUIRED_VARS CPP_LOGGER_FOUND CPP_LOGGER_INCLUDE_DIRS CPP_LOGGER_LIBRARIES)
9 changes: 3 additions & 6 deletions CMake/cpp-logger-config.cmake.install.in
Original file line number Diff line number Diff line change
Expand Up @@ -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 ()
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(cpp-logger
REQUIRED_VARS CPP_LOGGER_FOUND CPP_LOGGER_INCLUDE_DIRS CPP_LOGGER_LIBRARIES)
6 changes: 5 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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}
)
Expand Down