projects
/
openwrt
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tools/cmake: update to 3.10.1
[openwrt/.git]
/
tools
/
cmake
/
patches
/
100-disable_qt_tests.patch
diff --git
a/tools/cmake/patches/100-disable_qt_tests.patch
b/tools/cmake/patches/100-disable_qt_tests.patch
index f8baafe3331bf91acf8c71fc1295ad1cbfcb298c..6e8307dea4dca10a575e6f572defb3755300dfcb 100644
(file)
--- a/
tools/cmake/patches/100-disable_qt_tests.patch
+++ b/
tools/cmake/patches/100-disable_qt_tests.patch
@@
-1,6
+1,6
@@
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
-@@ -2
46,15 +246
,6 @@ add_RunCMake_test(no_install_prefix)
+@@ -2
73,15 +273
,6 @@ add_RunCMake_test(no_install_prefix)
add_RunCMake_test(configure_file)
add_RunCMake_test(CTestTimeoutAfterMatch)
add_RunCMake_test(configure_file)
add_RunCMake_test(CTestTimeoutAfterMatch)
@@
-18,14
+18,17
@@
add_RunCMake_test(FindPkgConfig)
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
add_RunCMake_test(FindPkgConfig)
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
-@@ -40
3,10 +403
,6 @@ if(BUILD_TESTING)
+@@ -40
7,13 +407
,6 @@ if(BUILD_TESTING)
list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})
list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})
-- if(NOT QT4_FOUND)
+- if(NOT DEFINED CMake_TEST_Qt4)
+- set(CMake_TEST_Qt4 1)
+- endif()
+- if(CMake_TEST_Qt4 AND NOT QT4_FOUND)
- find_package(Qt4 QUIET)
- endif()
-
- find_package(Qt4 QUIET)
- endif()
-
- if(QT4_FOUND)
+ if(
CMake_TEST_Qt4 AND
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"
# test whether the Qt4 which has been found works, on some machines
# which run nightly builds there were errors like "wrong file format"