diff options
| author | Kai Pastor <dg0yt@darc.de> | 2021-05-25 00:47:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-24 15:47:44 -0700 |
| commit | 44da6b78fc47d2cc0ea212cc5a9a15cb21f3d4aa (patch) | |
| tree | 25df6632c15275d44cb06b1110ded87aa3b7fcfc /scripts | |
| parent | fd5bc0cea64b5cf0965768e51d679cd1c6342ed0 (diff) | |
| download | vcpkg-44da6b78fc47d2cc0ea212cc5a9a15cb21f3d4aa.tar.gz vcpkg-44da6b78fc47d2cc0ea212cc5a9a15cb21f3d4aa.zip | |
[vcpkg_configure_make] Don't create empty elements in include path vars (#17970)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_configure_make.cmake | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index c5b2e5912..2294bf807 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -514,11 +514,18 @@ function(vcpkg_configure_make) endif()
# Setup include environment (since these are buildtype independent restoring them is unnecessary)
+ macro(prepend_include_path var)
+ if("${${var}_BACKUP}" STREQUAL "")
+ set(ENV{${var}} "${_VCPKG_INSTALLED}/include")
+ else()
+ set(ENV{${var}} "${_VCPKG_INSTALLED}/include${VCPKG_HOST_PATH_SEPARATOR}${${var}_BACKUP}")
+ endif()
+ endmacro()
# Used by CL
- set(ENV{INCLUDE} "${_VCPKG_INSTALLED}/include${VCPKG_HOST_PATH_SEPARATOR}${INCLUDE_BACKUP}")
+ prepend_include_path(INCLUDE)
# Used by GCC
- set(ENV{C_INCLUDE_PATH} "${_VCPKG_INSTALLED}/include${VCPKG_HOST_PATH_SEPARATOR}${C_INCLUDE_PATH_BACKUP}")
- set(ENV{CPLUS_INCLUDE_PATH} "${_VCPKG_INSTALLED}/include${VCPKG_HOST_PATH_SEPARATOR}${CPLUS_INCLUDE_PATH_BACKUP}")
+ prepend_include_path(C_INCLUDE_PATH)
+ prepend_include_path(CPLUS_INCLUDE_PATH)
# 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)
|