diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2020-02-09 14:40:13 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-09 14:40:13 -0800 |
| commit | 039098c9546195a50e45c41e37d7e2b9168b4245 (patch) | |
| tree | 6db941244c0dddb785ab1a5351cab7e4274490bd /scripts/buildsystems/vcpkg.cmake | |
| parent | f7fb56decd9d03cf79a1d23f44daa3a23560b995 (diff) | |
| download | vcpkg-039098c9546195a50e45c41e37d7e2b9168b4245.tar.gz vcpkg-039098c9546195a50e45c41e37d7e2b9168b4245.zip | |
[vcpkg] Add VCPKG_SUPPRESS_INSTALLED_LIBRARIES_WARNING and VCPKG_OVERRIDE_FIND_PACKAGE_NAME parameters to the vcpkg toolchain. (#9996)
VCPKG_SUPPRESS_INSTALLED_LIBRARIES_WARNING - Silences warning about lacking installed libraries for the current triplet
VCPKG_OVERRIDE_FIND_PACKAGE_NAME - Enables cooperation with other tooling that may want to hook find_package
Diffstat (limited to 'scripts/buildsystems/vcpkg.cmake')
| -rw-r--r-- | scripts/buildsystems/vcpkg.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 5b596cba2..3b41eb065 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -122,7 +122,7 @@ if(NOT DEFINED _VCPKG_ROOT_DIR) endif() set(_VCPKG_INSTALLED_DIR ${_VCPKG_ROOT_DIR}/installed) -if(NOT EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" AND NOT _CMAKE_IN_TRY_COMPILE) +if(NOT EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" AND NOT _CMAKE_IN_TRY_COMPILE AND NOT VCPKG_SUPPRESS_INSTALLED_LIBRARIES_WARNING) message(WARNING "There are no libraries installed for the Vcpkg triplet ${VCPKG_TARGET_TRIPLET}.") endif() @@ -233,7 +233,10 @@ function(add_library name) endif() endfunction() -macro(find_package name) +if(NOT DEFINED VCPKG_OVERRIDE_FIND_PACKAGE_NAME) + set(VCPKG_OVERRIDE_FIND_PACKAGE_NAME find_package) +endif() +macro(${VCPKG_OVERRIDE_FIND_PACKAGE_NAME} name) string(TOLOWER "${name}" _vcpkg_lowercase_name) if(EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/${_vcpkg_lowercase_name}/vcpkg-cmake-wrapper.cmake") set(ARGS "${ARGV}") |