Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[vcpkg-configure-make] Fix include path prepending (#24823) 

* Fix include path prepending

* Update DISABLE_VERBOSE_FLAGS documentation

Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com>

Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com>
This commit is contained in:
Kai Pastor 2022-05-20 23:41:10 +02:00 committed by GitHub
parent 7e2313f65b
commit f20c7bf05b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/maintainers/vcpkg_configure_make.md
View File

@ -16,6 +16,7 @@ vcpkg_configure_make(
[CONFIG_DEPENDENT_ENVIRONMENT <SOME_VAR>...]
[CONFIGURE_ENVIRONMENT_VARIABLES <SOME_ENVVAR>...]
[ADD_BIN_TO_PATH]
[DISABLE_VERBOSE_FLAGS]
[NO_DEBUG]
[SKIP_CONFIGURE]
[PROJECT_SUBPATH <${PROJ_SUBPATH}>]
@ -59,8 +60,8 @@ Script that needs to be called before configuration (do not use for batch files
### ADD_BIN_TO_PATH
Adds the appropriate Release and Debug `bin\` directories to the path during configure such that executables can run against the in-tree DLLs.
## DISABLE_VERBOSE_FLAGS
do not pass '--disable-silent-rules --verbose' to configure
### DISABLE_VERBOSE_FLAGS
Do not pass '--disable-silent-rules --verbose' to configure.
### OPTIONS
Additional options passed to configure during the configuration.

24
scripts/cmake/vcpkg_configure_make.cmake
View File

@ -15,6 +15,7 @@ vcpkg_configure_make(
[CONFIG_DEPENDENT_ENVIRONMENT <SOME_VAR>...]
[CONFIGURE_ENVIRONMENT_VARIABLES <SOME_ENVVAR>...]
[ADD_BIN_TO_PATH]
[DISABLE_VERBOSE_FLAGS]
[NO_DEBUG]
[SKIP_CONFIGURE]
[PROJECT_SUBPATH <${PROJ_SUBPATH}>]
@ -58,8 +59,8 @@ Script that needs to be called before configuration (do not use for batch files
### ADD_BIN_TO_PATH
Adds the appropriate Release and Debug `bin\` directories to the path during configure such that executables can run against the in-tree DLLs.
## DISABLE_VERBOSE_FLAGS
do not pass '--disable-silent-rules --verbose' to configure
### DISABLE_VERBOSE_FLAGS
Do not pass '--disable-silent-rules --verbose' to configure.
### OPTIONS
Additional options passed to configure during the configuration.
@ -208,19 +209,6 @@ macro(z_vcpkg_append_to_configure_environment inoutstring var defaultval)
endif()
endmacro()
# Setup include environment (since these are buildtype independent restoring them is unnecessary)
macro(z_prepend_include_path var)
unset(ENV{${var}})
if(NOT DEFINED z_vcpkg_env_backup_${var} OR "${z_vcpkg_env_backup_${var}}" STREQUAL "")
vcpkg_host_path_list(APPEND ENV{${var}} "${CURRENT_INSTALLED_DIR}/include")
else()
foreach (one_bk IN ITEMS ${z_vcpkg_env_backup_${var}})
vcpkg_host_path_list(PREPEND ENV{${var}} "${one_bk}")
endforeach()
vcpkg_host_path_list(PREPEND ENV{${var}} "${CURRENT_INSTALLED_DIR}/include")
endif()
endmacro()
macro(z_convert_to_list input output)
string(REGEX MATCHALL "(( +|^ *)[^ ]+)" ${output} "${${input}}")
endmacro()
@ -544,10 +532,10 @@ function(vcpkg_configure_make)
endif()
# Used by CL
z_prepend_include_path(INCLUDE)
vcpkg_host_path_list(PREPEND ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include")
# Used by GCC
z_prepend_include_path(C_INCLUDE_PATH)
z_prepend_include_path(CPLUS_INCLUDE_PATH)
vcpkg_host_path_list(PREPEND ENV{C_INCLUDE_PATH} "${CURRENT_INSTALLED_DIR}/include")
vcpkg_host_path_list(PREPEND ENV{CPLUS_INCLUDE_PATH} "${CURRENT_INSTALLED_DIR}/include")
# Flags should be set in the toolchain instead (Setting this up correctly requires a function named vcpkg_determined_cmake_compiler_flags which can also be used to setup CC and CXX etc.)
if(VCPKG_TARGET_IS_WINDOWS)