diff options
| author | Jake <jarveson@gmail.com> | 2020-04-03 12:22:28 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-03 10:22:28 -0700 |
| commit | 171ff2995ce2fb8c40de9e78ad6776d6b4478454 (patch) | |
| tree | 27d9615768916522352130094af1d22b4fa87898 | |
| parent | f4759a6ded9c7090df01c55a87a9fcecf860fe33 (diff) | |
| download | vcpkg-171ff2995ce2fb8c40de9e78ad6776d6b4478454.tar.gz vcpkg-171ff2995ce2fb8c40de9e78ad6776d6b4478454.zip | |
[freerdp] Fix include paths and output (#10630)
Signed-off-by: jarves <jarveson@gmail.com>
| -rw-r--r-- | ports/freerdp/CONTROL | 2 | ||||
| -rw-r--r-- | ports/freerdp/fix-include-path.patch | 26 | ||||
| -rw-r--r-- | ports/freerdp/portfile.cmake | 19 |
3 files changed, 45 insertions, 2 deletions
diff --git a/ports/freerdp/CONTROL b/ports/freerdp/CONTROL index 56e9b310a..86dd627a0 100644 --- a/ports/freerdp/CONTROL +++ b/ports/freerdp/CONTROL @@ -1,5 +1,5 @@ Source: freerdp -Version: 2.0.0-rc4-6 +Version: 2.0.0-rc4-7 Homepage: https://github.com/FreeRDP/FreeRDP Description: A free implementation of the Remote Desktop Protocol (RDP) Build-Depends: openssl, glib (!windows) diff --git a/ports/freerdp/fix-include-path.patch b/ports/freerdp/fix-include-path.patch new file mode 100644 index 000000000..e9efc3bd3 --- /dev/null +++ b/ports/freerdp/fix-include-path.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 019926901..91973c888 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -103,7 +103,7 @@ else() + endif() + message("FREERDP_VERSION=${FREERDP_VERSION_FULL}") + +-set(FREERDP_INCLUDE_DIR "include/freerdp${FREERDP_VERSION_MAJOR}/") ++set(FREERDP_INCLUDE_DIR "include/freerdp/") + + # Compatibility options + if(DEFINED STATIC_CHANNELS) +diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt +index 2da25a426..b06f718e9 100644 +--- a/winpr/CMakeLists.txt ++++ b/winpr/CMakeLists.txt +@@ -193,7 +193,7 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.10") + + SetFreeRDPCMakeInstallDir(WINPR_CMAKE_INSTALL_DIR "WinPR${WINPR_VERSION_MAJOR}") + +- set(WINPR_INCLUDE_DIR "include/winpr${WINPR_VERSION_MAJOR}") ++ set(WINPR_INCLUDE_DIR "include/winpr") + + configure_package_config_file(WinPRConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/WinPRConfig.cmake + INSTALL_DESTINATION ${WINPR_CMAKE_INSTALL_DIR} diff --git a/ports/freerdp/portfile.cmake b/ports/freerdp/portfile.cmake index b424441ba..0d15187c9 100644 --- a/ports/freerdp/portfile.cmake +++ b/ports/freerdp/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( fix-linux-build.patch openssl_threads.patch fix-include-install-path.patch + fix-include-path.patch ) if (NOT VCPKG_TARGET_IS_WINDOWS) @@ -60,7 +61,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") else() file(GLOB_RECURSE FREERDP_TOOLS "${CURRENT_PACKAGES_DIR}/bin/*") foreach(FREERDP_TOOL ${FREERDP_TOOLS}) - file(COPY ${FREERDP_TOOL} DESTINATION ${CURRENT_PACKAGES_DIR}/tools) + file(COPY ${FREERDP_TOOL} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) file(REMOVE ${FREERDP_TOOL}) endforeach() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) @@ -93,6 +94,22 @@ vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/WinPR/WinPRTargets-release.cm "lib/winpr-tools2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" "bin/winpr-tools2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" ) +vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/FreeRDP/FreeRDPTargets-debug.cmake + "debug/lib/freerdp2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" + "debug/bin/freerdp2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" +) +vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/FreeRDP/FreeRDPTargets-release.cmake + "lib/freerdp2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" + "bin/freerdp2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" +) +vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/FreeRDP-Client/FreeRDP-ClientTargets-debug.cmake + "debug/lib/freerdp-client2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" + "debug/bin/freerdp-client2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" +) +vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/FreeRDP-Client/FreeRDP-ClientTargets-release.cmake + "lib/freerdp-client2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" + "bin/freerdp-client2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" +) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share |