diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2020-08-22 02:04:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-22 02:04:16 -0700 |
| commit | b919cf7f7c382e8180ea995a500c5b91b2ba6384 (patch) | |
| tree | 534282ed2c28f2a0133931b0a01e56c6668cb833 | |
| parent | de0501f18704cbafea7f82a641d96e93deafcfa3 (diff) | |
| download | vcpkg-b919cf7f7c382e8180ea995a500c5b91b2ba6384.tar.gz vcpkg-b919cf7f7c382e8180ea995a500c5b91b2ba6384.zip | |
[vcpkg.cmake] check for vcpkg.json only in `${CMAKE_SOURCE_DIR}` (#12523)
| -rw-r--r-- | scripts/buildsystems/vcpkg.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 7eb6d474a..3471521f0 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -23,7 +23,13 @@ function(_vcpkg_get_directory_name_of_file_above OUT DIRECTORY FILENAME) set(${OUT} ${_vcpkg_get_dir_out} CACHE INTERNAL "_vcpkg_get_directory_name_of_file_above: ${OUT}") endfunction() -_vcpkg_get_directory_name_of_file_above(_VCPKG_MANIFEST_DIR ${CMAKE_CURRENT_SOURCE_DIR} "vcpkg.json") +if(NOT DEFINED VCPKG_MANIFEST_DIR) + if(EXISTS "${CMAKE_SOURCE_DIR}/vcpkg.json") + set(_VCPKG_MANIFEST_DIR "${CMAKE_SOURCE_DIR}/vcpkg.json") + endif() +else() + set(_VCPKG_MANIFEST_DIR ${VCPKG_MANIFEST_DIR}) +endif() if(NOT DEFINED VCPKG_MANIFEST_MODE) if(_VCPKG_MANIFEST_DIR) set(VCPKG_MANIFEST_MODE ON) |