diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-10-15 20:01:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-15 11:01:00 -0700 |
| commit | f919a1bf2beabdc1c53f2f9842eac44d72510a57 (patch) | |
| tree | 8d8101de91f63f80b1b1af60fd158593f5eb6809 /scripts | |
| parent | bfe983d721a0f2e0cd492f4b5632a952072b7e93 (diff) | |
| download | vcpkg-f919a1bf2beabdc1c53f2f9842eac44d72510a57.tar.gz vcpkg-f919a1bf2beabdc1c53f2f9842eac44d72510a57.zip | |
[vcpkg/cmake] add LOGNAME option (#14002)
Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_configure_cmake.cmake | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 63d7f8786..1a8915942 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -51,6 +51,9 @@ ## ### OPTIONS_DEBUG ## Additional options passed to CMake during the Debug configuration. These are in addition to `OPTIONS`. ## +## ### LOGNAME +## Name of the log to write the output of the configure call to. +## ## ## Notes ## This command supplies many common arguments to CMake. To see the full list, examine the source. ## @@ -64,7 +67,7 @@ function(vcpkg_configure_cmake) # parse parameters such that semicolons in arguments to OPTIONS don't get erased cmake_parse_arguments(PARSE_ARGV 0 _csc "PREFER_NINJA;DISABLE_PARALLEL_CONFIGURE;NO_CHARSET_FLAG" - "SOURCE_PATH;GENERATOR" + "SOURCE_PATH;GENERATOR;LOGNAME" "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE" ) @@ -73,6 +76,10 @@ function(vcpkg_configure_cmake) "however, vcpkg.exe must be rebuilt by re-running bootstrap-vcpkg.bat\n") endif() + if(NOT _csc_LOGNAME) + set(_csc_LOGNAME config-${TARGET_TRIPLET}) + endif() + if(CMAKE_HOST_WIN32) if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) set(_csc_HOST_ARCHITECTURE $ENV{PROCESSOR_ARCHITEW6432}) @@ -305,7 +312,7 @@ function(vcpkg_configure_cmake) vcpkg_execute_required_process( COMMAND ninja -v WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure - LOGNAME config-${TARGET_TRIPLET} + LOGNAME ${_csc_LOGNAME} ) else() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") @@ -314,7 +321,7 @@ function(vcpkg_configure_cmake) vcpkg_execute_required_process( COMMAND ${dbg_command} WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg - LOGNAME config-${TARGET_TRIPLET}-dbg + LOGNAME ${_csc_LOGNAME}-dbg ) endif() @@ -324,7 +331,7 @@ function(vcpkg_configure_cmake) vcpkg_execute_required_process( COMMAND ${rel_command} WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel - LOGNAME config-${TARGET_TRIPLET}-rel + LOGNAME ${_csc_LOGNAME}-rel ) endif() endif() |