diff options
| author | ras0219 <533828+ras0219@users.noreply.github.com> | 2020-12-15 10:26:00 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-15 10:26:00 -0800 |
| commit | 815396fa4e9e99da7af7d8454859f6247af1ef81 (patch) | |
| tree | 44bf8846dbc971bf758e58e146349c1f9ee11cd4 /scripts/ports.cmake | |
| parent | 2aaa67573085c24bcb4e224b87605d708d9a6377 (diff) | |
| download | vcpkg-815396fa4e9e99da7af7d8454859f6247af1ef81.tar.gz vcpkg-815396fa4e9e99da7af7d8454859f6247af1ef81.zip | |
[vcpkg] Refactor end-to-end tests (#15081)
* [vcpkg] Refactor end-to-end tests
* [vcpkg] Cherry-pick x-builtin-ports-root from #14999
* [vcpkg] Move create test from unit tests to e2e
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'scripts/ports.cmake')
| -rw-r--r-- | scripts/ports.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/ports.cmake b/scripts/ports.cmake index 9381b3d1a..723d7e1df 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -140,7 +140,9 @@ if(CMD MATCHES "^BUILD$") elseif(CMD MATCHES "^CREATE$") file(TO_NATIVE_PATH ${VCPKG_ROOT_DIR} NATIVE_VCPKG_ROOT_DIR) file(TO_NATIVE_PATH ${DOWNLOADS} NATIVE_DOWNLOADS) - set(PORT_PATH "${VCPKG_ROOT_DIR}/ports/${PORT}") + if(NOT DEFINED PORT_PATH) + set(PORT_PATH "${VCPKG_ROOT_DIR}/ports/${PORT}") + endif() file(TO_NATIVE_PATH ${PORT_PATH} NATIVE_PORT_PATH) set(PORTFILE_PATH "${PORT_PATH}/portfile.cmake") file(TO_NATIVE_PATH ${PORTFILE_PATH} NATIVE_PORTFILE_PATH) |
