diff options
| author | Daniel Engberg <daniel.engberg.lists@pyret.net> | 2018-04-04 10:02:32 +0200 |
|---|---|---|
| committer | Hans Dedecker <dedeckeh@gmail.com> | 2018-04-11 21:02:29 +0200 |
| commit | a8c315192b750453e1b821ab735bdabca43a4d0e (patch) | |
| tree | 652c014e0bdc95c00f12a3803267a4f9802c36d1 /tools/cmake/patches/100-disable_qt_tests.patch | |
| parent | f6e6eadc99c6274207f8f2ebc739063549959a1f (diff) | |
| download | upstream-a8c315192b750453e1b821ab735bdabca43a4d0e.tar.gz upstream-a8c315192b750453e1b821ab735bdabca43a4d0e.tar.bz2 upstream-a8c315192b750453e1b821ab735bdabca43a4d0e.zip | |
tools/cmake: Update to 3.11.0
Update cmake to 3.11.0
Remove 110-alpine_musl-compat.patch as it's integrated upstream
Rename and refresh patches
Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
Diffstat (limited to 'tools/cmake/patches/100-disable_qt_tests.patch')
| -rw-r--r-- | tools/cmake/patches/100-disable_qt_tests.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/cmake/patches/100-disable_qt_tests.patch b/tools/cmake/patches/100-disable_qt_tests.patch index 6e8307dea4..46cdc94563 100644 --- 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 -@@ -273,15 +273,6 @@ add_RunCMake_test(no_install_prefix) +@@ -284,15 +284,6 @@ add_RunCMake_test(no_install_prefix) add_RunCMake_test(configure_file) add_RunCMake_test(CTestTimeoutAfterMatch) @@ -18,7 +18,7 @@ add_RunCMake_test(FindPkgConfig) --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt -@@ -407,13 +407,6 @@ if(BUILD_TESTING) +@@ -422,13 +422,6 @@ if(BUILD_TESTING) list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX}) |