diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2018-07-08 09:53:19 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2018-07-08 09:53:19 +0000 |
| commit | 962fb8db5e87ee419a53bfadd3b3bf6ea5567ab3 (patch) | |
| tree | 713622fb644e482717f394e6c5d7cb2ed0fb9441 | |
| parent | 5fb15c65e4ecd62e6971d5a0bcc7d4ce819408a6 (diff) | |
| download | qmmp-962fb8db5e87ee419a53bfadd3b3bf6ea5567ab3.tar.gz qmmp-962fb8db5e87ee419a53bfadd3b3bf6ea5567ab3.tar.bz2 qmmp-962fb8db5e87ee419a53bfadd3b3bf6ea5567ab3.zip | |
cmake: added xcb.h checking
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8117 90c681e8-e032-0410-971d-27865f9a5e38
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/plugins/General/hotkey/CMakeLists.txt | 12 |
2 files changed, 6 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9fbc09604..cfd6e2caf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -215,11 +215,11 @@ PRINT_SUMMARY ("Notifier support .................." USE_NOTIFIER 1) PRINT_SUMMARY ("Lyrics support ...................." USE_LYRICS 1) PRINT_SUMMARY ("HAL support ......................." USE_HAL Qt5DBus_FOUND) PRINT_SUMMARY ("UDisks2 support ..................." USE_UDISKS2 Qt5DBus_FOUND) -PRINT_SUMMARY ("Global hotkey support ............." USE_HOTKEY X11_FOUND AND Qt5X11Extras_FOUND) +PRINT_SUMMARY ("Global hotkey support ............." USE_HOTKEY X11_FOUND AND XCB_H_FOUND AND Qt5X11Extras_FOUND) PRINT_SUMMARY ("GNOME/Cinnamon hotkey support ....." USE_GNOMEHOTKEY Qt5DBus_FOUND) PRINT_SUMMARY ("File operations ..................." USE_FILEOPS 1) PRINT_SUMMARY ("Cover manager ....................." USE_COVER 1) -PRINT_SUMMARY ("KDE4 notifications support ........" USE_KDENOTIFY Qt5DBus_FOUND) +PRINT_SUMMARY ("KDE4 notifications support........." USE_KDENOTIFY Qt5DBus_FOUND) PRINT_SUMMARY ("Audio converter ..................." USE_CONVERTER TAGLIB_FOUND) PRINT_SUMMARY ("ReplayGain Scanner ................" USE_RGSCAN TAGLIB_FOUND) PRINT_SUMMARY ("Stream browser ...................." USE_SB 1) diff --git a/src/plugins/General/hotkey/CMakeLists.txt b/src/plugins/General/hotkey/CMakeLists.txt index 46d7d1a5e..dc243937a 100644 --- a/src/plugins/General/hotkey/CMakeLists.txt +++ b/src/plugins/General/hotkey/CMakeLists.txt @@ -12,12 +12,8 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) -# xkb -CHECK_INCLUDE_FILE(X11/XKBlib.h XKBLIB_H_FOUND) -IF(XKBLIB_H_FOUND) -ADD_DEFINITIONS(-DHAVE_XKBLIB_H) -SET(CMAKE_REQUIRED_DEFINITIONS -DHAVE_XKBLIB_H) -ENDIF(XKBLIB_H_FOUND) +# xcb +CHECK_INCLUDE_FILE(xcb/xcb.h XCB_H_FOUND) SET(libhotkey_SRCS settingsdialog.cpp @@ -46,10 +42,10 @@ QT5_WRAP_UI(libhotkey_UIS_H ${libhotkey_UIS}) # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) -IF(X11_FOUND) +IF(X11_FOUND AND XCB_H_FOUND) set_property(SOURCE hotkeymanager_x11.cpp PROPERTY SKIP_AUTOMOC ON) ADD_LIBRARY(hotkey MODULE ${libhotkey_SRCS} ${libhotkey_UIS_H} ${libhotkey_RCC_SRCS}) add_dependencies(hotkey libqmmpui) target_link_libraries(hotkey Qt5::Widgets Qt5::X11Extras libqmmpui libqmmp ${X11_LDFLAGS}) install(TARGETS hotkey DESTINATION ${PLUGIN_DIR}/General) -ENDIF(X11_FOUND) +ENDIF(X11_FOUND AND XCB_H_FOUND) |