From 6bf46861602b6f3a962717068e7d87be6dd809a1 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Wed, 4 Nov 2020 23:05:54 -0800 Subject: [PATCH 1/4] [vcpkg_configure_make] Correct parameter SKIP_CONFIGURE --- scripts/cmake/vcpkg_configure_make.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index bf1f93b9d5ec03..5347c1f5789363 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -192,6 +192,8 @@ function(vcpkg_configure_make) set(_csc_AUTOCONFIG ON) elseif(EXISTS "${SRC_DIR}/autogen.sh") # Run autogen set(REQUIRES_AUTOGEN TRUE) + elseif (csc_SKIP_CONFIGURE) + message(STATUS "Skip the configuration step") else() message(FATAL_ERROR "Could not determine method to configure make") endif() From 91b6c09745d4bf76a39cbeb43340c5df266dfa1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 5 Nov 2020 18:00:55 -0800 Subject: [PATCH 2/4] Update scripts/cmake/vcpkg_configure_make.cmake Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> --- scripts/cmake/vcpkg_configure_make.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 5347c1f5789363..32bc5c2fd866e8 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -192,7 +192,7 @@ function(vcpkg_configure_make) set(_csc_AUTOCONFIG ON) elseif(EXISTS "${SRC_DIR}/autogen.sh") # Run autogen set(REQUIRES_AUTOGEN TRUE) - elseif (csc_SKIP_CONFIGURE) + elseif (csc_SKIP_CONFIGURE AND NOT EXISTS "${SRC_DIR}/configure") message(STATUS "Skip the configuration step") else() message(FATAL_ERROR "Could not determine method to configure make") From c4d446400982d93a4f367e807291000885151898 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 5 Nov 2020 18:21:32 -0800 Subject: [PATCH 3/4] Update scripts/cmake/vcpkg_configure_make.cmake --- scripts/cmake/vcpkg_configure_make.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 32bc5c2fd866e8..f250c86296f9e1 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -192,7 +192,7 @@ function(vcpkg_configure_make) set(_csc_AUTOCONFIG ON) elseif(EXISTS "${SRC_DIR}/autogen.sh") # Run autogen set(REQUIRES_AUTOGEN TRUE) - elseif (csc_SKIP_CONFIGURE AND NOT EXISTS "${SRC_DIR}/configure") + elseif (csc_SKIP_CONFIGURE AND NOT EXISTS "${SRC_DIR}/configure") # Must use configure when it exists; When SKIP_CONFIGURE is not used and configure does not exist, report error message(STATUS "Skip the configuration step") else() message(FATAL_ERROR "Could not determine method to configure make") From bd66acfda677ba3c77ab83652ab154e6c521bdff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 5 Nov 2020 18:56:18 -0800 Subject: [PATCH 4/4] Update scripts/cmake/vcpkg_configure_make.cmake --- scripts/cmake/vcpkg_configure_make.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index f250c86296f9e1..571456f0df50df 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -192,7 +192,7 @@ function(vcpkg_configure_make) set(_csc_AUTOCONFIG ON) elseif(EXISTS "${SRC_DIR}/autogen.sh") # Run autogen set(REQUIRES_AUTOGEN TRUE) - elseif (csc_SKIP_CONFIGURE AND NOT EXISTS "${SRC_DIR}/configure") # Must use configure when it exists; When SKIP_CONFIGURE is not used and configure does not exist, report error + elseif (_csc_SKIP_CONFIGURE AND NOT EXISTS "${SRC_DIR}/configure") # Must use configure when it exists; When SKIP_CONFIGURE is not used and configure does not exist, report error message(STATUS "Skip the configuration step") else() message(FATAL_ERROR "Could not determine method to configure make")