diff options
| author | David Schulz <david.schulz@qt.io> | 2019-06-20 08:09:16 +0200 |
|---|---|---|
| committer | David Schulz <david.schulz@qt.io> | 2019-06-20 12:25:21 +0000 |
| commit | 7b6ebea648bae91ee4ba014237eae34eb34d3805 (patch) | |
| tree | 4cd3a24bf7b78d1ae6b41b3bc1c21ad3eba61897 /src/libs/3rdparty/syntax-highlighting/CMakeLists.txt.kde | |
| parent | bd3037464e6d1f6a3af7beb6c40a49b54433efca (diff) | |
Update KSyntaxHighlighting 5.52 -> 5.59
Task-number: QTCREATORBUG-22558
Change-Id: I2eac03b54f2c2d330ee9b5d0037ee42a6640d76b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/libs/3rdparty/syntax-highlighting/CMakeLists.txt.kde')
| -rw-r--r-- | src/libs/3rdparty/syntax-highlighting/CMakeLists.txt.kde | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/libs/3rdparty/syntax-highlighting/CMakeLists.txt.kde b/src/libs/3rdparty/syntax-highlighting/CMakeLists.txt.kde index 49923fb26e..4f88fcf84a 100644 --- a/src/libs/3rdparty/syntax-highlighting/CMakeLists.txt.kde +++ b/src/libs/3rdparty/syntax-highlighting/CMakeLists.txt.kde @@ -1,9 +1,9 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.52.0") +set(KF5_VERSION "5.59.0") project(KSyntaxHighlighting VERSION ${KF5_VERSION}) -find_package(ECM 5.51.0 REQUIRED NO_MODULE) +find_package(ECM 5.59.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) if(POLICY CMP0063) cmake_policy(SET CMP0063 NEW) @@ -22,6 +22,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(ECMMarkNonGuiExecutable) include(ECMAddQch) +include(ECMOptionalAddSubdirectory) ecm_setup_version(PROJECT @@ -33,15 +34,16 @@ ecm_setup_version(PROJECT # # Dependencies # -set(REQUIRED_QT_VERSION 5.8.0) +set(REQUIRED_QT_VERSION 5.10.0) find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED COMPONENTS Core Network Test) option(KSYNTAXHIGHLIGHTING_USE_GUI "Build components depending on Qt5Gui" ON) if(KSYNTAXHIGHLIGHTING_USE_GUI) find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED COMPONENTS Gui) endif() -find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE QUIET OPTIONAL_COMPONENTS Widgets XmlPatterns) +find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE QUIET OPTIONAL_COMPONENTS PrintSupport Widgets XmlPatterns) set_package_properties(Qt5 PROPERTIES URL "http://qt-project.org/") set_package_properties(Qt5Widgets PROPERTIES PURPOSE "Example application.") +set_package_properties(Qt5PrintSupport PROPERTIES PURPOSE "Example application.") set_package_properties(Qt5XmlPatterns PROPERTIES PURPOSE "Compile-time validation of syntax definition files.") find_package(Perl REQUIRED) @@ -81,6 +83,7 @@ endif() if (NO_STANDARD_PATHS) add_definitions(-DNO_STANDARD_PATHS) endif() +add_definitions(-DQT_NO_FOREACH) # # Actually build the stuff @@ -90,6 +93,9 @@ add_subdirectory(data) add_subdirectory(src) if(TARGET Qt5::Gui) add_subdirectory(examples) + if (BUILD_TESTING) + add_subdirectory(autotests) + endif() endif() # |