From e4c11f8107d6eabcbf861c1dd34269a59fb2b752 Mon Sep 17 00:00:00 2001 From: Ulrich Mohr Date: Tue, 7 Feb 2023 12:26:44 +0100 Subject: [PATCH] fixing problem which causes a looooooong hang in CI by illegaly overrideing internal CMake Variable --- .../testcfg/windows/cmake/x64-windows-toolchain.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/unittests/testcfg/windows/cmake/x64-windows-toolchain.cmake b/unittests/testcfg/windows/cmake/x64-windows-toolchain.cmake index f62b0f64f..2b3bc044a 100644 --- a/unittests/testcfg/windows/cmake/x64-windows-toolchain.cmake +++ b/unittests/testcfg/windows/cmake/x64-windows-toolchain.cmake @@ -5,9 +5,13 @@ set(CMAKE_C_COMPILER /opt/msvc/bin/x64/cl) set(CMAKE_CXX_COMPILER /opt/msvc/bin/x64/cl) # built in tests fail -set(CMAKE_C_COMPILER_WORKS 1) -set(CMAKE_CXX_COMPILER_WORKS 1) +set(CMAKE_C_COMPILER_WORKS ON) +set(CMAKE_CXX_COMPILER_WORKS ON) +# fails somewhere caused by wine +# overriding internal variable DO NOT TRY THIS AT HOME! +set(CMAKE_C_ABI_COMPILED ON) +set(CMAKE_CXX_ABI_COMPILED ON) # adjust the default behavior of the FIND_XXX() commands: # search programs in the host environment