Merge pull request #733 from aox-ak/cmake_fix_pkg_config

cmake: fix generation of pkg-config files

Author: lti9hc

CMakeLists.txt

@@ -137,10 +137,10 @@ set(LICENSE "Mozilla Public License Version 2.0")
 find_package(Threads REQUIRED)
 if(WITH_DLT_LOGSTORAGE_GZIP)
     find_package(ZLIB 1.2.9 REQUIRED)
-    set(ZLIB_LIBRARY "ZLIB::ZLIB")
+    set(ZLIB_LIBRARY "-lz")
 elseif(WITH_DLT_COREDUMPHANDLER OR WITH_DLT_FILETRANSFER)
     find_package(ZLIB REQUIRED)
-    set(ZLIB_LIBRARY "ZLIB::ZLIB")
+    set(ZLIB_LIBRARY "-lz")
 else()
     set(ZLIB_LIBRARY "")
 endif()

src/core_dump_handler/CMakeLists.txt

@@ -29,7 +29,7 @@ if(WITH_DLT_COREDUMPHANDLER)
     endif(WITH_CITYHASH)
 
     add_executable(dlt-cdh ${dlt_cdh_SRCS})
-    target_link_libraries(dlt-cdh ${ZLIB_LIBRARY})
+    target_link_libraries(dlt-cdh ZLIB::ZLIB)
     set_target_properties(dlt-cdh PROPERTIES LINKER_LANGUAGE C)
 
     configure_file(${PROJECT_SOURCE_DIR}/src/core_dump_handler/50-coredump.conf.cmake ${PROJECT_BINARY_DIR}/core_dump_handler/50-coredump.conf)

src/daemon/CMakeLists.txt

@@ -67,7 +67,7 @@ if (WITH_SYSTEMD_SOCKET_ACTIVATION)
     target_link_libraries(dlt-daemon systemd)
 endif()
 if (WITH_DLT_LOGSTORAGE_GZIP)
-	target_link_libraries(dlt-daemon ${ZLIB_LIBRARY})
+	target_link_libraries(dlt-daemon ZLIB::ZLIB)
 endif()
 
 install(TARGETS dlt-daemon

src/system/CMakeLists.txt

@@ -39,7 +39,7 @@ if(WITH_SYSTEMD_JOURNAL)
 endif(WITH_SYSTEMD_JOURNAL)
 
 if(WITH_DLT_FILETRANSFER)
- target_link_libraries(dlt-system ${ZLIB_LIBRARY})
+ target_link_libraries(dlt-system ZLIB::ZLIB)
 endif(WITH_DLT_FILETRANSFER)
 
 set_target_properties(dlt-system PROPERTIES LINKER_LANGUAGE C)

tests/CMakeLists.txt

@@ -130,7 +130,7 @@ endif()
 foreach(target IN LISTS TARGET_LIST)
     set(target_SRCS ${target})
     add_executable(${target} ${target_SRCS} ${systemd_SRCS})
-    target_link_libraries(${target} ${DLT_DAEMON_LIBRARIES} ${ZLIB_LIBRARY})
+    target_link_libraries(${target} ${DLT_DAEMON_LIBRARIES} ZLIB::ZLIB)
     if(WITH_DLT_INSTALLED_TESTS)
         install(TARGETS ${target} RUNTIME DESTINATION ${DLT_TEST_DIR})
         if(EXISTS ${PROJECT_SOURCE_DIR}/tests/${target}.sh)