diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-11-25 13:17:54 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-25 13:17:54 -0800 |
| commit | b1f4391902fefab76a8c72451ca6d0609a0497e4 (patch) | |
| tree | 827e20d5ac119b20b8f431b3fcbc71722337f8cf | |
| parent | a3ea74b9ed174c4682243114e98b4e4d460e1383 (diff) | |
| parent | 70ade5e03a6834693861e44cada475ff733a4f89 (diff) | |
| download | vcpkg-b1f4391902fefab76a8c72451ca6d0609a0497e4.tar.gz vcpkg-b1f4391902fefab76a8c72451ca6d0609a0497e4.zip | |
Merge pull request #2247 from fquinner/patch-1
Fixed qpid-proton port to not need system python
| -rw-r--r-- | ports/qpid-proton/portfile.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ports/qpid-proton/portfile.cmake b/ports/qpid-proton/portfile.cmake index e5ba1d7ed..91be9aae3 100644 --- a/ports/qpid-proton/portfile.cmake +++ b/ports/qpid-proton/portfile.cmake @@ -2,6 +2,7 @@ include(vcpkg_common_functions) # Use this throughout rather than literal string set(QPID_PROTON_VERSION 0.18.1) +vcpkg_find_acquire_program(PYTHON2) # Go grab the code. Set SHA512 to 1 to get correct sha from download vcpkg_from_github( @@ -13,7 +14,9 @@ vcpkg_from_github( ) # Run cmake configure step -vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH}) +vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DPYTHON_EXECUTABLE=${PYTHON2}) # Run cmake install step vcpkg_install_cmake() @@ -33,4 +36,4 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake)
\ No newline at end of file +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake) |