aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-11-12 00:22:51 -0800
committerRobert Schumacher <roschuma@microsoft.com>2017-11-12 00:22:51 -0800
commitca947c664ace9039b14126dedccd12616add09c9 (patch)
treec1bbe4c965c822651df47a60a1c12c5032fe61b2
parent49e82f5db2ad2283c08216a7d940e78320372e12 (diff)
downloadvcpkg-ca947c664ace9039b14126dedccd12616add09c9.tar.gz
vcpkg-ca947c664ace9039b14126dedccd12616add09c9.zip
[allegro5][refprop-headers][libsodium][arb] Fix use of vcpkg_from_github's OUT_SOURCE_PATH parameter. Fixes #2178.
-rw-r--r--ports/allegro5/portfile.cmake3
-rw-r--r--ports/arb/portfile.cmake3
-rw-r--r--ports/libsodium/portfile.cmake3
-rw-r--r--ports/refprop-headers/portfile.cmake2
4 files changed, 4 insertions, 7 deletions
diff --git a/ports/allegro5/portfile.cmake b/ports/allegro5/portfile.cmake
index d4f74a569..46cb8020d 100644
--- a/ports/allegro5/portfile.cmake
+++ b/ports/allegro5/portfile.cmake
@@ -11,9 +11,8 @@
#
include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/allegro5-e8b209bc20a60224859eb8a0cae082bd20d32ed1)
vcpkg_from_github(
- OUT_SOURCE_PATH ${SOURCE_PATH}
+ OUT_SOURCE_PATH SOURCE_PATH
REPO liballeg/allegro5
REF e8b209bc20a60224859eb8a0cae082bd20d32ed1
SHA512 50b30d4b539bd4a2488d2b33e9fbfc6fdfd340039d9086993a5719bab3cb020ee6fe7f6d3578755a52c8aab9816d25cd74710ce93b0b374a2f97620b6138419d
diff --git a/ports/arb/portfile.cmake b/ports/arb/portfile.cmake
index 234ce1778..9b621723b 100644
--- a/ports/arb/portfile.cmake
+++ b/ports/arb/portfile.cmake
@@ -4,10 +4,9 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
endif()
include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/arb-2.11.1)
vcpkg_from_github(
- OUT_SOURCE_PATH ${SOURCE_PATH}
+ OUT_SOURCE_PATH SOURCE_PATH
REPO fredrik-johansson/arb
REF 2.11.1
SHA512 7a014da5208b55f20c7a3cd3eb51070b09ae107b04cbbd6329925780c2ab4d7c38e1fb3619f21456fa806939818370fcae921f59eb013661b6bdd3d0971e3353
diff --git a/ports/libsodium/portfile.cmake b/ports/libsodium/portfile.cmake
index b2329d248..4e6cd6be7 100644
--- a/ports/libsodium/portfile.cmake
+++ b/ports/libsodium/portfile.cmake
@@ -1,10 +1,9 @@
include(vcpkg_common_functions)
set(LIBSODIUM_VERSION 1.0.15)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libsodium-${LIBSODIUM_VERSION})
vcpkg_from_github(
- OUT_SOURCE_PATH ${SOURCE_PATH}
+ OUT_SOURCE_PATH SOURCE_PATH
REPO jedisct1/libsodium
REF ${LIBSODIUM_VERSION}
SHA512 ec497cb0007597efaeae0aecaa7484d6dcc53367607ec3fd28a98c6209f0cdecd5a6f560c15badd3a69b8da7d63676b11fb395ef4ed4da9b80467dbdc5f65a72
diff --git a/ports/refprop-headers/portfile.cmake b/ports/refprop-headers/portfile.cmake
index c8024d052..4b6274e12 100644
--- a/ports/refprop-headers/portfile.cmake
+++ b/ports/refprop-headers/portfile.cmake
@@ -2,7 +2,7 @@ include(vcpkg_common_functions)
set(PORT_COMMIT 882aec454b2bc3d5323b8691736ff09c288f4ed6)
vcpkg_from_github(
- OUT_SOURCE_PATH ${SOURCE_PATH}
+ OUT_SOURCE_PATH SOURCE_PATH
REPO CoolProp/REFPROP-headers
REF ${PORT_COMMIT}
SHA512 23ee3df4ffe21b2d790efa27a1b8ea5fa4fce0a274d78e493a2d71043670420e19216f925d23d04f6139ca084a21b97028bd2547f3dbd00ffbb33d0c0bbfece5