Skip to content

Commit 0efe77d

Browse files
rilian-la-terilian-la-te
committed
All: adapt to modern CMake (3.6 or later)
1 parent 8728394 commit 0efe77d

File tree

8 files changed

+22
-65
lines changed

8 files changed

+22
-65
lines changed

‎CMakeLists.txt‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
cmake_minimum_required (VERSION 3.3)
2-
cmake_policy (VERSION 3.3)
1+
cmake_minimum_required (VERSION 3.6 FATAL_ERROR)
2+
cmake_policy (VERSION 3.6)
33
project (vala-panel-extras C)
44
enable_testing ()
55
include(GNUInstallDirs)
@@ -51,28 +51,15 @@ find_package(GLIB2 2.50 REQUIRED COMPONENTS GOBJECT GIO GIO_UNIX GMODULE GTHREAD
5151
include(GLibProgramHandlers)
5252
find_package(GTK 3.22 REQUIRED COMPONENTS GDK X11 WAYLAND)
5353

54-
pkg_check_modules (CORE REQUIRED QUIET
55-
gtk+-3.0>=3.22
56-
glib-2.0>=2.50
57-
gio-2.0>=2.50
58-
gio-unix-2.0>=2.50
59-
gthread-2.0>=2.50
60-
gmodule-2.0>=2.50)
61-
6254
set(CORE_PACKAGES
6355
gtk+-3.0
6456
glib-2.0
6557
gio-2.0
6658
gio-unix-2.0
6759
gmodule-2.0)
6860

69-
set(PACKGAGE_CFLAGS ${CORE_CFLAGS})
70-
set(PACKAGE_LINK_DIRS ${CORE_LIBRARY_DIRS})
71-
set(PACKAGE_LIBRARIES ${CORE_LIBRARIES})
72-
73-
add_definitions (${CORE_CFLAGS})
74-
link_libraries (${CORE_LIBRARIES})
75-
link_directories (${CORE_LIBRARY_DIRS})
61+
#Link libraries for all targets
62+
link_libraries (GLIB2::GLIB GLIB2::GIO_UNIX GTK3::GDK GTK3::GTK m)
7663

7764

7865
# Some include paths

‎applets/CMakeLists.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
option(ENABLE_ALSA "Enable volume applet" ON)
22

33
if (ENABLE_ALSA)
4-
pkg_check_modules(ALSA alsa)
4+
pkg_check_modules(ALSA alsa IMPORTED_TARGET)
55
if (NOT(ALSA_FOUND))
66
set(ENABLE_ALSA OFF)
77
endif()
88
endif()
99

1010
if (ENABLE_ALSA)
11-
pkg_check_modules(CANBERRA libcanberra)
11+
pkg_check_modules(CANBERRA libcanberra IMPORTED_TARGET)
1212
if (CANBERRA_FOUND)
1313
set(CANBERRA_DEFINE -D CANBERRA)
1414
set(CANBERRA_PACKAGE "libcanberra")
@@ -24,8 +24,8 @@ endif()
2424

2525
option(ENABLE_WEATHER "Enable weather applet" ON)
2626
if (ENABLE_WEATHER)
27-
pkg_check_modules(LIBXML gweather-3.0)
28-
if (NOT(LIBXML_FOUND))
27+
pkg_check_modules(GWEATHER gweather-3.0 IMPORTED_TARGET)
28+
if (NOT(GWEATHER_FOUND))
2929
set(ENABLE_WEATHER OFF)
3030
endif()
3131
endif()
@@ -36,8 +36,8 @@ endif()
3636

3737
option(ENABLE_XKB "Enable xkb applet" ON)
3838
if (ENABLE_XKB)
39-
pkg_check_modules(XKB xkbcommon)
40-
pkg_check_modules(X11 xcb-xkb xkbcommon-x11 x11-xcb gdk-x11-3.0)
39+
pkg_check_modules(XKB xkbcommon IMPORTED_TARGET)
40+
pkg_check_modules(X11 xcb-xkb xkbcommon-x11 x11-xcb gdk-x11-3.0 IMPORTED_TARGET)
4141
if (NOT(XKB_FOUND) OR NOT(X11_FOUND))
4242
set(ENABLE_XKB OFF)
4343
endif()
@@ -49,7 +49,7 @@ endif()
4949

5050
option(ENABLE_LIBGTOP "Enable netload applet" ON)
5151
if (ENABLE_LIBGTOP)
52-
pkg_check_modules(LIBGTOP libgtop-2.0)
52+
pkg_check_modules(LIBGTOP libgtop-2.0 IMPORTED_TARGET)
5353
if (NOT(LIBGTOP_FOUND))
5454
set(ENABLE_LIBGTOP OFF)
5555
endif()

‎applets/batt/CMakeLists.txt‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,20 @@ OPTIONS
1212
--vapidir=${CMAKE_SOURCE_DIR}/vapi
1313
--vapidir=${CMAKE_BINARY_DIR}/lib
1414
--vapidir=${CMAKE_BINARY_DIR}/vapi
15-
--target-glib=2.40
15+
--target-glib=2.50
1616
--gresources=${CMAKE_CURRENT_SOURCE_DIR}/${PLUGIN_NAME}.gresource.xml
1717
--thread
1818
)
1919
#####
2020
# Plugin Library
2121
#####
2222

23-
# Build library for plugin
24-
set (LIBS ${CORE_LIBRARIES} -lm)
25-
set (LIB_PATHS ${CORE_LIBRARY_DIRS})
26-
link_directories (${LIB_PATHS})
27-
2823
add_executable (vala-panel-extras-${PLUGIN_NAME}
2924
${VALA_C}
3025
${RESOURCES}
3126
)
3227

33-
target_link_libraries (vala-panel-extras-${PLUGIN_NAME} ${LIBS} internal)
28+
target_link_libraries (vala-panel-extras-${PLUGIN_NAME} internal)
3429
add_custom_target(vala-files-${PLUGIN_NAME} SOURCES ${VALA_FILES})
3530
# Install plugin stuffs
3631
install(TARGETS vala-panel-extras-${PLUGIN_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

‎applets/gtop/CMakeLists.txt‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ OPTIONS
1212
--vapidir=${CMAKE_SOURCE_DIR}/vapi
1313
--vapidir=${CMAKE_BINARY_DIR}/lib
1414
--vapidir=${CMAKE_BINARY_DIR}/vapi
15-
--target-glib=2.40
15+
--target-glib=2.50
1616
--gresources=${CMAKE_CURRENT_SOURCE_DIR}/${PLUGIN_NAME}.gresource.xml
1717
--thread
1818
)
@@ -21,17 +21,13 @@ OPTIONS
2121
#####
2222

2323
# Build library for plugin
24-
set (LIBS ${CORE_LIBRARIES} ${LIBGTOP_LIBRARIES} -lm)
25-
set (LIB_PATHS ${CORE_LIBRARY_DIRS} ${LIBGTOP_LIBRARY_DIRS})
26-
include_directories(${LIBGTOP_INCLUDE_DIRS})
27-
link_directories (${LIB_PATHS})
2824

2925
add_executable (vala-panel-extras-${PLUGIN_NAME}
3026
${VALA_C}
3127
${RESOURCES}
3228
)
3329

34-
target_link_libraries (vala-panel-extras-${PLUGIN_NAME} ${LIBS} internal)
30+
target_link_libraries (vala-panel-extras-${PLUGIN_NAME} internal PkgConfig::LIBGTOP)
3531
add_custom_target(vala-files-${PLUGIN_NAME} SOURCES ${VALA_FILES})
3632

3733
# Install plugin stuffs

‎applets/volume/CMakeLists.txt‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ OPTIONS
1313
--vapidir=${CMAKE_SOURCE_DIR}/vapi
1414
--vapidir=${CMAKE_BINARY_DIR}/lib
1515
--vapidir=${CMAKE_BINARY_DIR}/vapi
16-
--target-glib=2.40
16+
--target-glib=2.50
1717
--gresources=${CMAKE_CURRENT_SOURCE_DIR}/${PLUGIN_NAME}.gresource.xml
1818
--thread
1919
${CANBERRA_DEFINE}
@@ -22,17 +22,12 @@ OPTIONS
2222
# Plugin Library
2323
#####
2424

25-
# Build library for plugin
26-
set (LIBS ${CORE_LIBRARIES} ${ALSA_LIBRARIES} ${CANBERRA_LIBRARIES} -lm)
27-
set (LIB_PATHS ${CORE_LIBRARY_DIRS})
28-
link_directories (${LIB_PATHS})
29-
3025
add_executable (vala-panel-extras-${PLUGIN_NAME}
3126
${VALA_C}
3227
${RESOURCES}
3328
)
3429

35-
target_link_libraries (vala-panel-extras-${PLUGIN_NAME} ${LIBS} internal)
30+
target_link_libraries (vala-panel-extras-${PLUGIN_NAME} PkgConfig::ALSA PkgConfig::CANBERRA internal)
3631
add_custom_target(vala-files-${PLUGIN_NAME} SOURCES ${VALA_FILES})
3732
# Install plugin stuffs
3833
install(TARGETS vala-panel-extras-${PLUGIN_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

‎applets/weather/CMakeLists.txt‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ OPTIONS
1414
--vapidir=${CMAKE_SOURCE_DIR}/vapi
1515
--vapidir=${CMAKE_BINARY_DIR}/lib
1616
--vapidir=${CMAKE_BINARY_DIR}/vapi
17-
--target-glib=2.40
17+
--target-glib=2.50
1818
--gresources=${CMAKE_CURRENT_SOURCE_DIR}/${PLUGIN_NAME}.gresource.xml
1919
--thread
2020
)
@@ -26,19 +26,14 @@ glib_compile_resources(RESOURCES
2626
${PLUGIN_NAME}.gresource.xml
2727
)
2828
# Build library for plugin
29-
set (LIBS ${CORE_LIBRARIES} ${LIBXML_LIBRARIES} -lm)
30-
set (LIB_PATHS ${CORE_LIBRARY_DIRS} ${LIBXML_LIBRARY_DIRS})
31-
set (LIB_CFLAGS ${CORE_CFLAGS} ${LIBXML_CFLAGS})
32-
add_definitions(-DGWEATHER_I_KNOW_THIS_IS_UNSTABLE)
33-
include_directories(${LIBXML_INCLUDE_DIRS})
34-
link_directories (${LIB_PATHS})
3529

3630
add_executable (vala-panel-extras-${PLUGIN_NAME}
3731
${VALA_C}
3832
${RESOURCES}
3933
)
4034

41-
target_link_libraries (vala-panel-extras-${PLUGIN_NAME} ${LIBS} internal)
35+
target_link_libraries (vala-panel-extras-${PLUGIN_NAME} PkgConfig::GWEATHER internal m)
36+
target_compile_definitions(vala-panel-extras-${PLUGIN_NAME} PRIVATE -DGWEATHER_I_KNOW_THIS_IS_UNSTABLE)
4237
add_custom_target(vala-files-${PLUGIN_NAME} SOURCES ${VALA_FILES})
4338
# Install plugin stuffs
4439
install(TARGETS vala-panel-extras-${PLUGIN_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

‎applets/xkb/CMakeLists.txt‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ OPTIONS
1717
--vapidir=${CMAKE_SOURCE_DIR}/vapi
1818
--vapidir=${CMAKE_BINARY_DIR}/lib
1919
--vapidir=${CMAKE_BINARY_DIR}/vapi
20-
--target-glib=2.40
20+
--target-glib=2.50
2121
--gresources=${CMAKE_CURRENT_SOURCE_DIR}/${PLUGIN_NAME}.gresource.xml
2222
--thread
2323
)
@@ -30,16 +30,12 @@ glib_compile_resources(RESOURCES
3030
)
3131

3232
# Build library for plugin
33-
set (LIBS ${CORE_LIBRARIES} ${XKB_LIBRARIES} ${X11_LIBRARIES})
34-
set (LIB_PATHS ${CORE_LIBRARY_DIRS} ${XKB_LIBRARY_DIRS} ${X11_LIBRARY_DIRS})
35-
include_directories(${CORE_INCLUDE_DIRS} ${XKB_INCLUDE_DIRS} ${X11_INCLUDE_DIRS})
36-
link_directories (${LIB_PATHS})
3733
add_executable (vala-panel-extras-${PLUGIN_NAME}
3834
${VALA_C}
3935
${RESOURCES}
4036
)
4137

42-
target_link_libraries (vala-panel-extras-${PLUGIN_NAME} ${LIBS} internal)
38+
target_link_libraries (vala-panel-extras-${PLUGIN_NAME} PkgConfig::XKB PkgConfig::X11 internal)
4339
add_custom_target(vala-files-${PLUGIN_NAME} SOURCES ${VALA_FILES})
4440
# Install plugin stuffs
4541
install(TARGETS vala-panel-extras-${PLUGIN_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

‎lib/CMakeLists.txt‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,13 @@ add_definitions(-DG_SETTINGS_ENABLE_BACKEND)
2828
# Core Library
2929
#####
3030

31-
# Build library for plugins and application
32-
set (LIBS ${CORE_LIBRARIES} -lm)
33-
set (LIB_PATHS ${CORE_LIBRARY_DIRS})
34-
link_directories (${LIB_PATHS})
35-
3631
set (LIB_FILES ${VALA_C})
3732

3833
add_library (internal STATIC
3934
${LIB_FILES}
4035
${GLIB_RESOURCES_LIB}
4136
)
4237
add_custom_target(vala-files-lib SOURCES ${CORE_VALA_FILES})
43-
target_link_libraries (internal ${LIBS})
44-
4538
set_target_properties (internal PROPERTIES
4639
VERSION 0.0
4740
SOVERSION 0)

0 commit comments

Comments
 (0)