diff options
| author | fquinner <fquinn.ni@gmail.com> | 2017-11-22 21:51:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-22 21:51:40 +0000 |
| commit | 70ade5e03a6834693861e44cada475ff733a4f89 (patch) | |
| tree | 982730ca8693e2c378244b5a7ea5153bc8c40613 | |
| parent | e6c65b93b125cf0be13254cf2f5a9d27cb009707 (diff) | |
| download | vcpkg-70ade5e03a6834693861e44cada475ff733a4f89.tar.gz vcpkg-70ade5e03a6834693861e44cada475ff733a4f89.zip | |
Fixed qpid-proton port to not need system python
Tried to build the last version of the port on a fresh build but
wouldn't work properly unless python.exe was already installed
on the system. This version explicitly uses the vcpkg provided
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) |