aboutsummaryrefslogtreecommitdiffstats
path: root/tools/cmake/patches/100-no-testing.patch
diff options
context:
space:
mode:
authorHannu Nyman <hannu.nyman@iki.fi>2020-08-23 17:11:11 +0300
committerHans Dedecker <dedeckeh@gmail.com>2020-08-23 19:40:42 +0200
commit84834df9b9867b37b1ac6ade8abcf17cda456974 (patch)
treee0833c77fa8c9d1e73dd35bc5fc22dfbb0729c5f /tools/cmake/patches/100-no-testing.patch
parent4faf7704a2426c1b93262473d547e38fa067c356 (diff)
downloadupstream-84834df9b9867b37b1ac6ade8abcf17cda456974.tar.gz
upstream-84834df9b9867b37b1ac6ade8abcf17cda456974.tar.bz2
upstream-84834df9b9867b37b1ac6ade8abcf17cda456974.zip
tools/cmake: update to 3.18.2
Update cmake to version 3.18.2. Refresh patches. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Diffstat (limited to 'tools/cmake/patches/100-no-testing.patch')
-rw-r--r--tools/cmake/patches/100-no-testing.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/cmake/patches/100-no-testing.patch b/tools/cmake/patches/100-no-testing.patch
index 501302b835..44452ce39e 100644
--- a/tools/cmake/patches/100-no-testing.patch
+++ b/tools/cmake/patches/100-no-testing.patch
@@ -1,6 +1,6 @@
--- a/Modules/CTest.cmake
+++ b/Modules/CTest.cmake
-@@ -47,7 +47,7 @@ the :variable:`CTEST_USE_LAUNCHERS` variable::
+@@ -47,7 +47,7 @@ the :variable:`CTEST_USE_LAUNCHERS` vari
in the ``CTestConfig.cmake`` file.
#]=======================================================================]
@@ -11,7 +11,7 @@
# like vs9 or vs10
--- a/Modules/Dart.cmake
+++ b/Modules/Dart.cmake
-@@ -33,7 +33,7 @@ whether testing support should be enabled. The default is ON.
+@@ -33,7 +33,7 @@ whether testing support should be enable
#
#
@@ -22,12 +22,12 @@
find_package(Dart QUIET)
--- a/Tests/Contracts/VTK/Dashboard.cmake.in
+++ b/Tests/Contracts/VTK/Dashboard.cmake.in
-@@ -25,7 +25,7 @@ ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY})
+@@ -25,7 +25,7 @@ ctest_empty_binary_directory(${CTEST_BIN
file(WRITE "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt" "
- BUILD_EXAMPLES:BOOL=ON
-- BUILD_TESTING:BOOL=ON
-+ BUILD_TESTING:BOOL=OFF
+ VTK_BUILD_EXAMPLES:BOOL=ON
+- VTK_BUILD_TESTING:STRING=WANT
++ VTK_BUILD_TESTING:STRING=OFF
VTK_WRAP_PYTHON:BOOL=ON
ExternalData_OBJECT_STORES:FILEPATH=@base_dir@/ExternalData
")