support SKIP_CONFIGURE in vcpkg_configure_make. (#8647)

This commit is contained in:
JackBoosY 2019-10-22 07:23:52 +08:00 committed by Victor Romero
parent b99d073412
commit 988b1c9897
2 changed files with 25 additions and 13 deletions

View File

@ -11,6 +11,7 @@ vcpkg_configure_make(
[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 @@ Should use `GENERATOR NMake` first.
### NO_DEBUG
This port doesn't support debug mode.
### SKIP_CONFIGURE
Skip configure process
### AUTOCONFIG
Need to use autoconfig to generate configure file.

View File

@ -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