projects
/
lede-git
/
.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.4.0
[lede-git/.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 3d44dac53f27c5cf2b1c1c03689255c0825a65b9..417e27afab9101c88f98a31bf80485f4be16be89 100644
(file)
--- a/
tools/cmake/patches/100-disable_qt_tests.patch
+++ b/
tools/cmake/patches/100-disable_qt_tests.patch
@@
-1,8
+1,8
@@
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
-@@ -
101,16 +101
,6 @@
- add_RunCMake_test(
TargetPolicies
)
- add_RunCMake_test(
alias_targets
)
+@@ -
216,15 +216
,6 @@
+ add_RunCMake_test(
no_install_prefix
)
+ add_RunCMake_test(
configure_file
)
-find_package(Qt4 QUIET)
-find_package(Qt5Core QUIET)
-find_package(Qt4 QUIET)
-find_package(Qt5Core QUIET)
@@
-10,21
+10,20
@@
- add_RunCMake_test(IncompatibleQt)
-endif()
-if (QT4_FOUND)
- add_RunCMake_test(IncompatibleQt)
-endif()
-if (QT4_FOUND)
-- set(ObsoleteQtMacros_ARGS -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE})
-- add_RunCMake_test(ObsoleteQtMacros)
+- add_RunCMake_test(ObsoleteQtMacros -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE})
-endif()
-
-endif()
-
-
if("${CMAKE_TEST_GENERATOR}" MATCHES "Visual Studio [^6]"
)
-
add_RunCMake_test(include_external_msproject
)
- add_RunCMake_test(
SolutionGlobalSections
)
+
find_package(PkgConfig QUIET
)
+
if(PKG_CONFIG_FOUND
)
+ add_RunCMake_test(
FindPkgConfig
)
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
-@@ -
262,10 +262
,6 @@
+@@ -
390,10 +390
,6 @@
list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})
- if(NOT QT4_FOUND)
list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})
- if(NOT QT4_FOUND)
-- find_package(Qt4)
+- find_package(Qt4
QUIET
)
- endif()
-
if(QT4_FOUND)
- endif()
-
if(QT4_FOUND)