From 04b5df1f3a3da56ff8e709d7f9688b28df4e1e90 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 13 Feb 2023 12:34:42 -0500 Subject: Tests: Fix FindPatch test with VS generators Tell CTest the project used to name the `.sln` file. --- Tests/FindPatch/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Tests/FindPatch/CMakeLists.txt b/Tests/FindPatch/CMakeLists.txt index 541f5bd..65b778b 100644 --- a/Tests/FindPatch/CMakeLists.txt +++ b/Tests/FindPatch/CMakeLists.txt @@ -4,5 +4,6 @@ add_test(NAME FindPatch.Test COMMAND "${CMake_SOURCE_DIR}/Tests/FindPatch/Test" "${CMake_BINARY_DIR}/Tests/FindPatch/Test" ${build_generator_args} + --build-project TestFindPatch --build-options ${build_options} ) -- cgit v0.12 From 1e35257ee1ee9296c6acb8ef5ee451989bb7e95e Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 13 Feb 2023 12:35:46 -0500 Subject: ci: Enable FindPatch tests on Windows VS builds The `patch` tool comes with Git for Windows, which is installed on our Windows CI hosts as part of running their gitlab-runner. --- .gitlab/ci/configure_windows_vs_common.cmake | 1 + .gitlab/ci/configure_windows_vs_common_ninja.cmake | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitlab/ci/configure_windows_vs_common.cmake b/.gitlab/ci/configure_windows_vs_common.cmake index 962f03d..daf9aaa 100644 --- a/.gitlab/ci/configure_windows_vs_common.cmake +++ b/.gitlab/ci/configure_windows_vs_common.cmake @@ -4,6 +4,7 @@ set(CMake_TEST_FindOpenMP "ON" CACHE BOOL "") set(CMake_TEST_FindOpenMP_C "ON" CACHE BOOL "") set(CMake_TEST_FindOpenMP_CXX "ON" CACHE BOOL "") set(CMake_TEST_FindOpenMP_Fortran "OFF" CACHE BOOL "") +set(CMake_TEST_FindPatch "ON" CACHE BOOL "") set(CMake_TEST_Java OFF CACHE BOOL "") set(CMake_TEST_MFC "ON" CACHE BOOL "") diff --git a/.gitlab/ci/configure_windows_vs_common_ninja.cmake b/.gitlab/ci/configure_windows_vs_common_ninja.cmake index 1ae1a66..9f7acc3 100644 --- a/.gitlab/ci/configure_windows_vs_common_ninja.cmake +++ b/.gitlab/ci/configure_windows_vs_common_ninja.cmake @@ -6,6 +6,7 @@ set(CMake_TEST_FindOpenMP "ON" CACHE BOOL "") set(CMake_TEST_FindOpenMP_C "ON" CACHE BOOL "") set(CMake_TEST_FindOpenMP_CXX "ON" CACHE BOOL "") set(CMake_TEST_FindOpenMP_Fortran "OFF" CACHE BOOL "") +set(CMake_TEST_FindPatch "ON" CACHE BOOL "") set(CMake_TEST_IPO_WORKS_C "ON" CACHE BOOL "") set(CMake_TEST_IPO_WORKS_CXX "ON" CACHE BOOL "") set(CMake_TEST_MFC "ON" CACHE BOOL "") -- cgit v0.12