cmake: use modern GLib imported targets

Signed-off-by: László Várady <laszlo.varady@protonmail.com>

Author: MrAnno

cmake/Modules/FindGLIB.cmake

@@ -122,3 +122,49 @@ mark_as_advanced(
     GLIB_INCLUDE_DIRS
     GLIB_LIBRARIES
 )
+
+if (GLIB_FOUND AND NOT TARGET GLib::GLib)
+    add_library(GLib::GLib UNKNOWN IMPORTED)
+    set_target_properties(GLib::GLib PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES "${GLIB_INCLUDE_DIRS}"
+        INTERFACE_LINK_LIBRARIES "${GLIB_LIBRARIES}"
+        IMPORTED_LOCATION "${GLIB_LIBRARIES}"
+    )
+endif ()
+
+
+if (EXISTS "${GLIB_GIO_LIBRARIES}" AND NOT TARGET GLib::GIO)
+    add_library(GLib::GIO UNKNOWN IMPORTED)
+    set_target_properties(GLib::GIO PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES "${GLIB_INCLUDE_DIRS}"
+        INTERFACE_LINK_LIBRARIES "${GLIB_GIO_LIBRARIES}"
+        IMPORTED_LOCATION "${GLIB_GIO_LIBRARIES}"
+    )
+endif ()
+
+if (EXISTS "${GLIB_GOBJECT_LIBRARIES}" AND NOT TARGET GLib::GObject)
+    add_library(GLib::GObject UNKNOWN IMPORTED)
+    set_target_properties(GLib::GObject PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES "${GLIB_INCLUDE_DIRS}"
+        INTERFACE_LINK_LIBRARIES "${GLIB_GOBJECT_LIBRARIES}"
+        IMPORTED_LOCATION "${GLIB_GOBJECT_LIBRARIES}"
+    )
+endif ()
+
+if (EXISTS "${GLIB_GMODULE_LIBRARIES}" AND NOT TARGET GLib::GModule)
+    add_library(GLib::GModule UNKNOWN IMPORTED)
+    set_target_properties(GLib::GModule PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES "${GLIB_INCLUDE_DIRS}"
+        INTERFACE_LINK_LIBRARIES "${GLIB_GMODULE_LIBRARIES}"
+        IMPORTED_LOCATION "${GLIB_GMODULE_LIBRARIES}"
+    )
+endif ()
+
+if (EXISTS "${GLIB_GTHREAD_LIBRARIES}" AND NOT TARGET GLib::GThread)
+    add_library(GLib::GThread UNKNOWN IMPORTED)
+    set_target_properties(GLib::GThread PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES "${GLIB_INCLUDE_DIRS}"
+        INTERFACE_LINK_LIBRARIES "${GLIB_GTHREAD_LIBRARIES}"
+        IMPORTED_LOCATION "${GLIB_GTHREAD_LIBRARIES}"
+    )
+endif ()

lib/CMakeLists.txt

@@ -296,7 +296,6 @@ bison_target(ParserExprGrammar
 add_flex_bison_dependency(CfgLexer ParserExprGrammar)
 
 set(CORE_INCLUDE_DIRS
-    ${GLIB_INCLUDE_DIRS}
     ${Gettext_INCLUDE_DIR}
     ${IVYKIS_INCLUDE_DIR}
     ${LIBPCRE_INCLUDE_DIRS}
@@ -320,9 +319,9 @@ target_link_libraries(
     syslog-ng
   PUBLIC
     eventlog
-    ${GLIB_GMODULE_LIBRARIES}
-    ${GLIB_GTHREAD_LIBRARIES}
-    ${GLIB_LIBRARIES}
+    GLib::GLib
+    GLib::GThread
+    GLib::GModule
     ${Gettext_LIBRARIES}
     ${IVYKIS_LIBRARY}
     ${LIBPCRE_LIBRARIES}

lib/eventlog/CMakeLists.txt

@@ -12,13 +12,11 @@ target_include_directories(eventlog
   SYSTEM
   INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}/src
-  PRIVATE
-    ${GLIB_INCLUDE_DIRS}
 )
 
 target_link_libraries(eventlog
   PRIVATE
-    ${GLIB_LIBRARIES}
+    GLib::GLib
 )
 
 install(TARGETS eventlog DESTINATION lib)

lib/secret-storage/CMakeLists.txt

@@ -9,12 +9,11 @@ add_library(secret-storage SHARED ${SECRET_STORAGE_SOURCES})
 
 target_include_directories(secret-storage
   PRIVATE
-    ${GLIB_INCLUDE_DIRS}
     # workaround, "compat" should be a separate static library
     ${PROJECT_SOURCE_DIR}/lib
 )
 
-target_link_libraries(secret-storage PRIVATE ${GLIB_LIBRARIES})
+target_link_libraries(secret-storage PRIVATE GLib::GLib)
 set_target_properties(secret-storage PROPERTIES C_VISIBILITY_PRESET hidden)
 
 install(TARGETS secret-storage LIBRARY DESTINATION lib)

persist-tool/CMakeLists.txt

@@ -10,15 +10,14 @@ add_executable(persist-tool ${PERSIST-TOOL_SOURCE})
 include_directories(persist-tool
   ${CORE_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}
-  ${GLIB_INCLUDE_DIRS}
   ${PROJECT_SOURCE_DIR}/lib
   ${PROJECT_SOURCE_DIR}/lib/eventlog/src
   )
 
 target_link_libraries(persist-tool
-  ${GLIB_GMODULE_LIBRARIES}
-  ${GLIB_GTHREAD_LIBRARIES}
-  ${GLIB_LIBRARIES}  
+  GLib::GLib
+  GLib::GModule
+  GLib::GThread
   syslog-ng
   )
 

syslog-ng-ctl/CMakeLists.txt

@@ -22,7 +22,7 @@ add_executable(syslog-ng-ctl ${SYSLOG_NG_CTL_SOURCES})
 target_link_libraries(syslog-ng-ctl PRIVATE
     syslog-ng
     secret-storage
-    ${GLIB_LIBRARIES}
+    GLib::GLib
     ${RESOLV_LIBS})
 target_include_directories(syslog-ng-ctl PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 install(TARGETS syslog-ng-ctl RUNTIME DESTINATION sbin)

tests/loggen/CMakeLists.txt

@@ -12,16 +12,15 @@ add_library(loggen_helper STATIC ${LOGGEN_HELPER_SOURCE})
 target_include_directories(loggen_helper PUBLIC
   ${CORE_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}
-  ${GLIB_INCLUDE_DIRS}
   ${PROJECT_SOURCE_DIR}/lib
   )
 
 target_link_libraries(
   loggen_helper
   PUBLIC
-  ${GLIB_GMODULE_LIBRARIES}
-  ${GLIB_GTHREAD_LIBRARIES}
-  ${GLIB_LIBRARIES}
+  GLib::GLib
+  GLib::GModule
+  GLib::GThread
   OpenSSL::SSL
   )
 

tests/loggen/ssl_plugin/CMakeLists.txt

@@ -1,6 +1,5 @@
 include_directories(loggen_ssl_plugin
   ${CORE_INCLUDE_DIRS}
-  ${GLIB_INCLUDE_DIRS}
   ${LOGGEN_INCLUDE_DIR}
   )
 
@@ -18,9 +17,9 @@ add_library(loggen_ssl_plugin
 target_link_libraries(
   loggen_ssl_plugin
   loggen_helper
-  ${GLIB_GMODULE_LIBRARIES}
-  ${GLIB_GTHREAD_LIBRARIES}
-  ${GLIB_LIBRARIES}
+  GLib::GLib
+  GLib::GModule
+  GLib::GThread
   OpenSSL::SSL
   )