From 988b1c989797380b92ef19c651e391bac546e0dc Mon Sep 17 00:00:00 2001 From: JackBoosY <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 22 Oct 2019 07:23:52 +0800 Subject: support SKIP_CONFIGURE in vcpkg_configure_make. (#8647) --- scripts/cmake/vcpkg_configure_make.cmake | 34 ++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 13 deletions(-) (limited to 'scripts') diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index c73f5c800..10426a0c8 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -11,6 +11,7 @@ ## [DISABLE_AUTO_DST] ## [GENERATOR] ## [NO_DEBUG] +## [SKIP_CONFIGURE] ## [PROJECT_SUBPATH <${PROJ_SUBPATH}>] ## [PRERUN_SHELL <${SHELL_PATH}>] ## [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] @@ -32,6 +33,9 @@ ## ### NO_DEBUG ## This port doesn't support debug mode. ## +## ### SKIP_CONFIGURE +## Skip configure process +## ## ### AUTOCONFIG ## Need to use autoconfig to generate configure file. ## @@ -71,7 +75,7 @@ ## * [libosip2](https://github.com/Microsoft/vcpkg/blob/master/ports/libosip2/portfile.cmake) function(vcpkg_configure_make) cmake_parse_arguments(_csc - "AUTOCONFIG;DISABLE_AUTO_HOST;DISABLE_AUTO_DST;NO_DEBUG" + "AUTOCONFIG;DISABLE_AUTO_HOST;DISABLE_AUTO_DST;NO_DEBUG;SKIP_CONFIGURE" "SOURCE_PATH;PROJECT_SUBPATH;GENERATOR;PRERUN_SHELL" "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE" ${ARGN} @@ -270,12 +274,14 @@ function(vcpkg_configure_make) endif() endif() - message(STATUS "Configuring ${TARGET_TRIPLET}-dbg") - vcpkg_execute_required_process( - COMMAND ${dbg_command} - WORKING_DIRECTORY ${PRJ_DIR} - LOGNAME config-${TARGET_TRIPLET}-dbg - ) + if (NOT _csc_SKIP_CONFIGURE) + message(STATUS "Configuring ${TARGET_TRIPLET}-dbg") + vcpkg_execute_required_process( + COMMAND ${dbg_command} + WORKING_DIRECTORY ${PRJ_DIR} + LOGNAME config-${TARGET_TRIPLET}-dbg + ) + endif() endif() # Configure release @@ -343,12 +349,14 @@ function(vcpkg_configure_make) endif() endif() - message(STATUS "Configuring ${TAR_TRIPLET_DIR}") - vcpkg_execute_required_process( - COMMAND ${rel_command} - WORKING_DIRECTORY ${PRJ_DIR} - LOGNAME config-${TAR_TRIPLET_DIR} - ) + if (NOT _csc_SKIP_CONFIGURE) + message(STATUS "Configuring ${TAR_TRIPLET_DIR}") + vcpkg_execute_required_process( + COMMAND ${rel_command} + WORKING_DIRECTORY ${PRJ_DIR} + LOGNAME config-${TAR_TRIPLET_DIR} + ) + endif() endif() # Restore envs -- cgit v1.2.3