From f3f9a89daece661c8a3e1c4a2568034b92ae177a Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sat, 7 Oct 2017 21:39:22 +0000 Subject: fixed cmake 3.10 support git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7523 90c681e8-e032-0410-971d-27865f9a5e38 --- CMakeLists.txt | 4 ++++ src/plugins/General/hotkey/CMakeLists.txt | 1 + 2 files changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index ac8093e15..6813bd758 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,6 +9,10 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /opt/local/include) ENDIF() +if(POLICY CMP0071) + cmake_policy(SET CMP0071 NEW) +endif() + #extract version from qmmp.h FILE(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/src/qmmp/qmmp.h" QMMP_VERSION_DATA REGEX "^#define[ \t]+QMMP_VERSION_[A-Z]+[ \t]+[0-9]+.*$") diff --git a/src/plugins/General/hotkey/CMakeLists.txt b/src/plugins/General/hotkey/CMakeLists.txt index 2e35f2b33..9cf51d112 100644 --- a/src/plugins/General/hotkey/CMakeLists.txt +++ b/src/plugins/General/hotkey/CMakeLists.txt @@ -61,6 +61,7 @@ QT4_WRAP_UI(libhotkey_UIS_H ${libhotkey_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(X11_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 qmmpui) target_link_libraries(hotkey ${QT_LIBRARIES} qmmpui libqmmp ${X11_LDFLAGS}) -- cgit v1.2.3-13-gbd6f