diff options
| author | Todor Prokopov <koprok@users.noreply.github.com> | 2020-02-12 03:30:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-11 17:30:03 -0800 |
| commit | f478be7479f4a418d46c34156bb34ae4f87656af (patch) | |
| tree | aebf211e460ef405e7e5cd6787d5732b9dd4bc62 /ports/kd-soap | |
| parent | 5f12ffae8d6444383ed6d88da08ee32876726ebc (diff) | |
| download | vcpkg-f478be7479f4a418d46c34156bb34ae4f87656af.tar.gz vcpkg-f478be7479f4a418d46c34156bb34ae4f87656af.zip | |
[many ports] Support building with MinGW toolchain (#8940)
* Some package fixes necessary to build with MinGW toolchain
* [libraqm] Fix build error caused by trying to write to source directory
* [tmxparser] Fix build failure when tmx port is intalled before tmxparser port
System include path was added first on compiler command line. This leads to
build failure when there is a tmx.h header file in system include path.
* [qt5-base][angle] Trigger CI rebuild
* [kd-soap] Fix build error
* Update ci.baseline
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'ports/kd-soap')
| -rw-r--r-- | ports/kd-soap/CONTROL | 2 | ||||
| -rw-r--r-- | ports/kd-soap/portfile.cmake | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ports/kd-soap/CONTROL b/ports/kd-soap/CONTROL index b399126c1..2bc553cf5 100644 --- a/ports/kd-soap/CONTROL +++ b/ports/kd-soap/CONTROL @@ -1,5 +1,5 @@ Source: kd-soap
-Version: 1.8.0
+Version: 1.8.0-1
Description: A Qt-based client-side and server-side SOAP component
Homepage: https://www.kdab.com/products/kd-soap
Build-Depends: qt5-base
diff --git a/ports/kd-soap/portfile.cmake b/ports/kd-soap/portfile.cmake index 61102836c..d924d1c65 100644 --- a/ports/kd-soap/portfile.cmake +++ b/ports/kd-soap/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KDAB/KDSoap
@@ -19,8 +17,11 @@ vcpkg_install_cmake() # 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.exe ${CURRENT_PACKAGES_DIR}/tools/kdwsdl2cpp.exe)
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/kdwsdl2cpp.exe)
+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)
|