diff options
| author | Phoebe <925731795@qq.com> | 2019-09-24 04:47:07 +0800 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-09-23 13:47:07 -0700 |
| commit | 36cd8ef27727908a607aabf76cc0569cc874fbde (patch) | |
| tree | 2e961b16db7365cda3934c0b75daa6df9b3157bb | |
| parent | 839cdff896114d423bfdb0abc8ffa6bb6d839337 (diff) | |
| download | vcpkg-36cd8ef27727908a607aabf76cc0569cc874fbde.tar.gz vcpkg-36cd8ef27727908a607aabf76cc0569cc874fbde.zip | |
[open62541] fix dynamic build (#8252)
* [open62541] fix dynamic build
* Add the regex back to unblock --head revision
| -rw-r--r-- | ports/open62541/CONTROL | 2 | ||||
| -rw-r--r-- | ports/open62541/portfile.cmake | 17 |
2 files changed, 11 insertions, 8 deletions
diff --git a/ports/open62541/CONTROL b/ports/open62541/CONTROL index bff3217bb..7a3306df9 100644 --- a/ports/open62541/CONTROL +++ b/ports/open62541/CONTROL @@ -1,3 +1,3 @@ Source: open62541 -Version: 0.3.0-3 +Version: 0.3.0-4 Description: open62541 is an open source C (C99) implementation of OPC UA licensed under the Mozilla Public License v2.0. diff --git a/ports/open62541/portfile.cmake b/ports/open62541/portfile.cmake index d0e26df3f..3f7469d17 100644 --- a/ports/open62541/portfile.cmake +++ b/ports/open62541/portfile.cmake @@ -35,25 +35,27 @@ vcpkg_add_to_path("${PYTHON3_DIR}") if(CMAKE_HOST_WIN32) # Must not modify system copy of python3 -- on CMAKE_HOST_WIN32, we have our own private copy - if(NOT EXISTS ${PYTHON3_DIR}/easy_install.exe) - if(NOT EXISTS ${PYTHON3_DIR}/Scripts/pip.exe) + if(NOT EXISTS ${PYTHON3_DIR}/easy_install${EXECUTABLE_SUFFIX}) + if(NOT EXISTS ${PYTHON3_DIR}/Scripts/pip${EXECUTABLE_SUFFIX}) get_filename_component(PYTHON3_DIR_NAME "${PYTHON3_DIR}" NAME) vcpkg_download_distfile(GET_PIP URLS "https://bootstrap.pypa.io/3.3/get-pip.py" FILENAME "tools/python/${PYTHON3_DIR_NAME}/get-pip.py" SHA512 92e68525830bb23955a31cb19ebc3021ef16b6337eab83d5db2961b791283d2867207545faf83635f6027f2f7b7f8fee2c85f2cfd8e8267df25406474571c741 ) - execute_process(COMMAND ${PYTHON3_DIR}/python.exe ${GET_PIP}) + execute_process(COMMAND ${PYTHON3_DIR}/python${EXECUTABLE_SUFFIX} ${GET_PIP}) endif() - execute_process(COMMAND ${PYTHON3_DIR}/Scripts/pip.exe install six) + execute_process(COMMAND ${PYTHON3_DIR}/Scripts/pip${EXECUTABLE_SUFFIX} install six) else() - execute_process(COMMAND ${PYTHON3_DIR}/easy_install.exe six) + execute_process(COMMAND ${PYTHON3_DIR}/easy_install${EXECUTABLE_SUFFIX} six) endif() endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS + -DBIN_INSTALL_DIR:STRING=bin OPTIONS_DEBUG -DCMAKE_DEBUG_POSTFIX=d ) @@ -70,5 +72,6 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/open62541/tools) -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/open62541) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/open62541/LICENSE ${CURRENT_PACKAGES_DIR}/share/open62541/copyright) +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) |