From fd9058c19fd8802a055be32baaca11544c33466b Mon Sep 17 00:00:00 2001
From: Xisco Fauli <xiscofauli@libreoffice.org>
Date: Mon, 16 Mar 2026 10:45:29 +0100
Subject: [PATCH] use cmake from visual studio extensions in cygwin

Change-Id: Id3b895e8833dd65457f4c03791f2aa698c4a27ab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201805
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
---
 config_host.mk.in                     |  1 +
 configure.ac                          | 11 +++++++++++
 external/curl/ExternalProject_curl.mk |  4 ++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/config_host.mk.in b/config_host.mk.in
index 45940b6b258b..9766a3eee46a 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -76,6 +76,7 @@ export CLUCENE_CFLAGS=$(gb_SPACE)@CLUCENE_CFLAGS@
 export CLUCENE_LIBS=$(gb_SPACE)@CLUCENE_LIBS@
 export LIBCMIS_CFLAGS=$(gb_SPACE)@LIBCMIS_CFLAGS@
 export LIBCMIS_LIBS=$(gb_SPACE)@LIBCMIS_LIBS@
+export CMAKE=@CMAKE@
 export COM=@COM@
 export COMPATH=@COMPATH@
 export COMPILER_PLUGINS=@COMPILER_PLUGINS@
diff --git a/configure.ac b/configure.ac
index 136e9bddd518..40ddbb8007d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4618,6 +4618,7 @@ test_cl_exe()
 SOLARINC=
 MSBUILD_PATH=
 DEVENV=
+CMAKE=
 if test "$_os" = "WINNT"; then
     AC_MSG_CHECKING([Visual C++])
     find_msvc "$with_visual_studio"
@@ -4696,6 +4697,15 @@ if test "$_os" = "WINNT"; then
         AC_MSG_ERROR([MSBuild.exe location not found])
     fi
 
+    # Find the cmake.exe
+    if test "$build_os" = "cygwin"; then
+        PathFormat "$VC_PRODUCT_DIR/../Common7/IDE//CommonExtensions/Microsoft/CMake/CMake/bin/cmake.exe"
+        CMAKE="$formatted_path"
+    else
+        # in WSL cmake is picked up from strawberry-perl-portable
+        CMAKE=cmake
+    fi
+
     # Find the version of devenv.exe
     PathFormat "$VC_PRODUCT_DIR/../Common7/IDE/devenv.exe"
     DEVENV="$formatted_path"
@@ -4804,6 +4814,7 @@ if test "$_os" = "WINNT"; then
 fi
 AC_SUBST(VCVER)
 AC_SUBST(VCTOOLSET)
+AC_SUBST(CMAKE)
 AC_SUBST(DEVENV)
 AC_SUBST(MSVC_CXX)
 
diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk
index 8951f125d306..652cc30021a3 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -79,7 +79,7 @@ else ifeq ($(COM),MSC)
 $(call gb_ExternalProject_get_state_target,curl,build):
 	$(call gb_Trace_StartRange,curl,EXTERNAL)
 	$(call gb_ExternalProject_run,build,\
-		cmake . \
+		$(CMAKE) . \
 			$(if $(filter 17.%,$(VCVER)),-G "Visual Studio 17 2022") \
 			$(if $(filter 18.%,$(VCVER)),-G "Visual Studio 18 2026") \
 			-A $(gb_MSBUILD_PLATFORM) \
@@ -106,7 +106,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
 			-DCURL_DISABLE_SMTP=ON \
 			-DCURL_DISABLE_TELNET=ON \
 			-DCURL_DISABLE_TFTP=ON \
-		&& cmake --build . --config $(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
+		&& $(CMAKE) --build . --config $(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
 	)
 	$(call gb_Trace_EndRange,curl,EXTERNAL)