mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-10-31 14:04:26 -04:00
5a5657cda1
Update cmake to 3.5.1 Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 49186
32 lines
977 B
Diff
32 lines
977 B
Diff
--- a/Tests/RunCMake/CMakeLists.txt
|
|
+++ b/Tests/RunCMake/CMakeLists.txt
|
|
@@ -217,15 +217,6 @@ add_RunCMake_test(interface_library)
|
|
add_RunCMake_test(no_install_prefix)
|
|
add_RunCMake_test(configure_file)
|
|
|
|
-find_package(Qt4 QUIET)
|
|
-find_package(Qt5Core QUIET)
|
|
-if (QT4_FOUND AND Qt5Core_FOUND AND NOT Qt5Core_VERSION VERSION_LESS 5.1.0)
|
|
- add_RunCMake_test(IncompatibleQt)
|
|
-endif()
|
|
-if (QT4_FOUND)
|
|
- add_RunCMake_test(ObsoleteQtMacros -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE})
|
|
-endif()
|
|
-
|
|
find_package(PkgConfig QUIET)
|
|
if(PKG_CONFIG_FOUND)
|
|
add_RunCMake_test(FindPkgConfig)
|
|
--- a/Tests/CMakeLists.txt
|
|
+++ b/Tests/CMakeLists.txt
|
|
@@ -389,10 +389,6 @@ if(BUILD_TESTING)
|
|
|
|
list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})
|
|
|
|
- if(NOT QT4_FOUND)
|
|
- find_package(Qt4 QUIET)
|
|
- endif()
|
|
-
|
|
if(QT4_FOUND)
|
|
# test whether the Qt4 which has been found works, on some machines
|
|
# which run nightly builds there were errors like "wrong file format"
|