diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2020-09-19 08:17:21 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-18 17:17:21 -0700 |
| commit | 13590753fec479c5b0a3d48dd553dde8d49615fc (patch) | |
| tree | fad155e091ef56d6f91fda2b212ecfc5c0b53b5d /ports/kd-soap | |
| parent | 35d7e4f0b30800691c59b25c5ea95e4d64e0623f (diff) | |
| download | vcpkg-13590753fec479c5b0a3d48dd553dde8d49615fc.tar.gz vcpkg-13590753fec479c5b0a3d48dd553dde8d49615fc.zip | |
[inja/kd-soap/fastrtps/graphite2/jsonnet] Update to latest release revision (#13584)
* [inja/kd-soap/fastrtps/graphite2/jsonnet] Update to latest release revision
* Fix license path for fastrtps and remove bin with static build for kd-soap
Diffstat (limited to 'ports/kd-soap')
| -rw-r--r-- | ports/kd-soap/CONTROL | 4 | ||||
| -rw-r--r-- | ports/kd-soap/kd-soap.patch | 12 | ||||
| -rw-r--r-- | ports/kd-soap/portfile.cmake | 18 |
3 files changed, 13 insertions, 21 deletions
diff --git a/ports/kd-soap/CONTROL b/ports/kd-soap/CONTROL index e9d922e0f..edcba960d 100644 --- a/ports/kd-soap/CONTROL +++ b/ports/kd-soap/CONTROL @@ -1,5 +1,5 @@ Source: kd-soap
-Version: 1.8.0-2
-Description: A Qt-based client-side and server-side SOAP component
+Version: 1.9.0
Homepage: https://www.kdab.com/products/kd-soap
+Description: A Qt-based client-side and server-side SOAP component
Build-Depends: qt5-base[core]
diff --git a/ports/kd-soap/kd-soap.patch b/ports/kd-soap/kd-soap.patch deleted file mode 100644 index d48050faf..000000000 --- a/ports/kd-soap/kd-soap.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c3c824e..d7a1cce 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -168,6 +168,6 @@ if(${PROJECT_NAME}_IS_ROOT_PROJECT) - enable_testing() - add_subdirectory(testtools) - add_subdirectory(unittests) -+ add_subdirectory(examples) - endif() -- add_subdirectory(examples) - endif() diff --git a/ports/kd-soap/portfile.cmake b/ports/kd-soap/portfile.cmake index d924d1c65..03f99fab8 100644 --- a/ports/kd-soap/portfile.cmake +++ b/ports/kd-soap/portfile.cmake @@ -1,28 +1,32 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KDAB/KDSoap
- REF kdsoap-1.8.0
- SHA512 e118f2083887d1b5d613d793e87ec23a570a8a749ef7f4de65582998b735979b4c389a939169a893d735bdf110dc84a4cca5ee38146e4009be715902f6323bb9
+ REF fb0e905e242c2044fd25683a406eb6d369db052f # kdsoap-1.9.0
+ SHA512 30f78602702f2bb77f72bf0637b413d70976cf10789b18d1eb9c097f6b3821b86e75d0ae921454b2d39b7d023f479dc089cde1915533a37054f9b26893f611d3
HEAD_REF master
- PATCHES kd-soap.patch
)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KDSoap_STATIC)
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
+ OPTIONS
+ -DKDSoap_STATIC=${KDSoap_STATIC}
+ -DKDSoap_EXAMPLES=OFF
)
vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KDSoap TARGET_PATH share/KDSoap)
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/kd-soap RENAME copyright)
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools)
file(RENAME ${CURRENT_PACKAGES_DIR}/bin/kdwsdl2cpp${VCPKG_TARGET_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/kdwsdl2cpp${VCPKG_TARGET_EXECUTABLE_SUFFIX})
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/kdwsdl2cpp${VCPKG_TARGET_EXECUTABLE_SUFFIX})
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
endif()
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+
+file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|