diff --git a/include/cmake.mk b/include/cmake.mk index 29c5aacb831..96332b3b3de 100644 --- a/include/cmake.mk +++ b/include/cmake.mk @@ -127,6 +127,7 @@ define Build/Configure/Default -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=TRUE \ -DCMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY=FALSE \ -DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=TRUE \ + -DBUILD_TESTING=OFF \ $(CMAKE_OPTIONS) \ $(CMAKE_SOURCE_DIR) \ ) @@ -175,6 +176,7 @@ define Host/Configure/Default -DCMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY=FALSE \ -DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=TRUE \ -DBUILD_SHARED_LIBS=OFF \ + -DBUILD_TESTING=OFF \ $(CMAKE_HOST_OPTIONS) \ $(HOST_CMAKE_SOURCE_DIR) \ ) diff --git a/tools/cmake/Makefile b/tools/cmake/Makefile index b70507baed8..0ab72afd155 100644 --- a/tools/cmake/Makefile +++ b/tools/cmake/Makefile @@ -37,7 +37,8 @@ HOST_CONFIGURE_ARGS := \ --system-liblzma \ --system-zlib \ --system-zstd \ - --generator=Ninja + --generator=Ninja \ + -- -DBUILD_TESTING=OFF CMAKE_HOST_OPTIONS = \ -DZSTD_INCLUDE_DIR="$(STAGING_DIR_HOST)/include" \ diff --git a/tools/cmake/patches/100-no-testing.patch b/tools/cmake/patches/100-no-testing.patch deleted file mode 100644 index ae3bba6b74f..00000000000 --- a/tools/cmake/patches/100-no-testing.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/Modules/CTest.cmake -+++ b/Modules/CTest.cmake -@@ -60,7 +60,7 @@ the :variable:`CTEST_USE_LAUNCHERS` vari - in the ``CTestConfig.cmake`` file. - #]=======================================================================] - --option(BUILD_TESTING "Build the testing tree." ON) -+option(BUILD_TESTING "Build the testing tree." OFF) - - # function to turn generator name into a version string - # like vs9 or vs10 ---- a/Modules/Dart.cmake -+++ b/Modules/Dart.cmake -@@ -46,7 +46,7 @@ if(cmp0145 STREQUAL "") - cmake_policy(ISSUE_WARNING CMP0145) - endif() - --option(BUILD_TESTING "Build the testing tree." ON) -+option(BUILD_TESTING "Build the testing tree." OFF) - - if(BUILD_TESTING) - # We only get here if a project already ran include(Dart), ---- a/Tests/Contracts/VTK/Dashboard.cmake.in -+++ b/Tests/Contracts/VTK/Dashboard.cmake.in -@@ -25,7 +25,7 @@ ctest_empty_binary_directory(${CTEST_BIN - - file(WRITE "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt" " - 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 - ")