diff --git a/CMake/cpp-logger-config.cmake.build.in b/CMake/cpp-logger-config.cmake.build.in
index 2e85c47..eb3582a 100644
--- a/CMake/cpp-logger-config.cmake.build.in
+++ b/CMake/cpp-logger-config.cmake.build.in
@@ -9,9 +9,14 @@ 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")
+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-logger-targets.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
+            REQUIRED_VARS CPP_LOGGER_FOUND CPP_LOGGER_INCLUDE_DIRS CPP_LOGGER_LIBRARIES)
diff --git a/CMake/cpp-logger-config.cmake.install.in b/CMake/cpp-logger-config.cmake.install.in
index e53ea2c..0ccb8f4 100644
--- a/CMake/cpp-logger-config.cmake.install.in
+++ b/CMake/cpp-logger-config.cmake.install.in
@@ -9,9 +9,13 @@ 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@")
+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 "")
+if (NOT TARGET cpp-logger)
+  include(${CMAKE_CURRENT_LIST_DIR}/cpp-logger-targets.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
+        REQUIRED_VARS CPP_LOGGER_FOUND CPP_LOGGER_INCLUDE_DIRS CPP_LOGGER_LIBRARIES)