tjh.dev
1--- a/CMakeLists.txt
2+++ b/CMakeLists.txt
3@@ -2,7 +2,7 @@
4 project(dbm)
5
6 include(CheckCXXSourceCompiles)
7-include (CheckCXXCompilerFlag)
8+include(CheckCXXCompilerFlag)
9
10 check_cxx_compiler_flag(-fvisibility=hidden __DBUSMENU_HAVE_GCC_VISIBILITY)
11 if (__DBUSMENU_HAVE_GCC_VISIBILITY AND NOT WIN32)
12@@ -19,27 +19,13 @@
13 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
14 endif (__DBUSMENU_HAVE_W_ALL)
15
16-
17-find_library(LIB_GLIB NAMES glib libglib libglib-2.0.so.0)
18-MESSAGE("LIB_GLIB: " ${LIB_GLIB})
19-
20-find_library(LIB_GIO NAMES libgio-2.0.so.0)
21-MESSAGE("LIB_GIO: " ${LIB_GIO})
22-
23-find_library(LIB_GOBJ NAMES libgobject-2.0.so.0)
24-MESSAGE("LIB_GOBJ: " ${LIB_GOBJ})
25+find_package(PkgConfig REQUIRED)
26+pkg_search_module(GLIB REQUIRED glib-2.0)
27+pkg_search_module(LIBDBUSMENU REQUIRED dbusmenu-glib-0.4)
28
29 # use patched library, you may build it from https://github.com/JetBrains/libdbusmenu
30 set(LIB_DBUSMENU "${PROJECT_SOURCE_DIR}/libdbusmenu-glib.a")
31
32-set(GLIB_INCLUDE_DIRS /usr/include/glib-2.0 /usr/lib64/glib-2.0/include)
33-set(DBUSMENU_GLIB_INCLUDE_DIRS /usr/include/libdbusmenu-glib-0.4)
34-
35-include_directories(
36- ${GLIB_INCLUDE_DIRS}
37- ${DBUSMENU_GLIB_INCLUDE_DIRS}
38-)
39-
40 set(CMAKE_C_STANDARD 11)
41 set(CMAKE_C_FLAGS "-std=gnu99 ${CMAKE_C_FLAGS}")
42 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
43@@ -47,7 +33,8 @@
44 set(SOURCE_FILES DbusMenuWrapper.c)
45
46 add_library(dbm SHARED ${SOURCE_FILES})
47-target_link_libraries(dbm ${LIB_GLIB} ${LIB_GIO} ${LIB_DBUSMENU} ${LIB_GOBJ})
48+target_link_libraries(dbm ${LIB_DBUSMENU} ${GLIB_LDFLAGS})
49+include_directories(dbm ${GLIB_INCLUDE_DIRS} ${LIBDBUSMENU_INCLUDE_DIRS})
50
51 if (TESTS_ENABLED)
52 find_library(LIB_GTK NAMES libgtk-3.so)