testing/cmake
SHA256
3
0
Fork 0
forked from pool/cmake
Code Pull Requests Activity
d754e77339
cmake/cmake-fix-test-without-git.patch

44 lines
1.4 KiB
Diff
Raw Normal View History

Accepting request 1185206 from home:mathletic:branches:devel:tools:building - udate to 3.30.0 * "cmake-presets(7)" files now support schema version "9". "include" fields now expand all macros except "$env{}" and preset-specific macros, i.e., those derived from the fields inside a preset's definition. * The "Compile Features" functionality now implements support for the "cxx_std_26" and "cuda_std_26" meta-features to indicate that the compiler mode must be at least C++26. * The "CMAKE_<LANG>_STANDARD_LATEST" variable was added to describe the latest "<LANG>" language standard CMake supports for the selected compiler. * The "CMAKE_TLS_VERSION" variable and "CMAKE_TLS_VERSION" environment variable were added to specify a default minimum TLS version for connections to "https://" URLs by the "file(DOWNLOAD)" and "file(UPLOAD)" commands. * The "GENERATED" source file property is now visible in all directories. See policy "CMP0163". Policy "CMP0118"'s documentation has been revised to describe its actual effects. * The "TARGET_PROPERTY" generator expression learned to evaluate custom transitive properties. * The "CPack WIX Generator" gained support for WiX Toolset v4. See the "CPACK_WIX_VERSION" variable. * The "FindBoost" module has been removed by policy "CMP0167". Port projects to upstream Boost's "BoostConfig.cmake" package configuration file, for which "find_package(Boost)" now searches. - Add cmake-fix-test-without-git.patch to fix test #567 to be run conditionally when Git is found, upstream planned for 3.30.1 OBS-URL: https://build.opensuse.org/request/show/1185206 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=587
2024-07-04 09:04:30 +02:00
From fe8dc3012eca70ed1ecc1774466c7eb5bee6e8c1 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Wed, 3 Jul 2024 10:40:07 -0400
Subject: [PATCH] Tests: Fix RunCMake.ExternalProject when git is not available
Move Git-dependent test cases added by commit 2ef3bd9186
(ExternalProject: Add TLS version options for https connections,
2024-02-26, v3.30.0-rc1~471^2) into the block of cases that run only
when Git is found.
Fixes: #26104
---
Tests/RunCMake/ExternalProject/RunCMakeTest.cmake | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/Tests/RunCMake/ExternalProject/RunCMakeTest.cmake b/Tests/RunCMake/ExternalProject/RunCMakeTest.cmake
index 3c7cd68e7e7..98e3996c892 100644
--- a/Tests/RunCMake/ExternalProject/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ExternalProject/RunCMakeTest.cmake
@@ -15,9 +15,6 @@ endif()
run_cmake(BadIndependentStep1)
run_cmake(BadIndependentStep2)
-run_cmake(TLSVersionBadArg)
-run_cmake(TLSVersionBadVar)
-run_cmake(TLSVersionBadEnv)
run_cmake(NoOptions)
run_cmake(SourceEmpty)
run_cmake(SourceMissing)
@@ -256,5 +253,9 @@ if(GIT_EXECUTABLE)
# on some platforms. It may go to stdout or stderr, so force it to be merged.
set(RunCMake_TEST_OUTPUT_MERGE TRUE)
run_cmake(FetchGitRefs)
- set(RunCMake_TEST_OUTPUT_MERGE FALSE)
+ unset(RunCMake_TEST_OUTPUT_MERGE)
+
+ run_cmake(TLSVersionBadArg)
+ run_cmake(TLSVersionBadVar)
+ run_cmake(TLSVersionBadEnv)
endif()
--
GitLab
Copy Permalink