diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2020-02-08 01:47:25 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-07 09:47:25 -0800 |
| commit | a6fc98381f481050c517dcd7a3bad911e005c056 (patch) | |
| tree | f7f7c05d31593b6798eea35e50d5e4ae6d35fbeb | |
| parent | b8971ffdd080f85a055961d5251c32c456211d0e (diff) | |
| download | vcpkg-a6fc98381f481050c517dcd7a3bad911e005c056.tar.gz vcpkg-a6fc98381f481050c517dcd7a3bad911e005c056.zip | |
[freerdp] Fix include install path (#9944)
| -rw-r--r-- | ports/freerdp/CONTROL | 2 | ||||
| -rw-r--r-- | ports/freerdp/fix-include-install-path.patch | 26 | ||||
| -rw-r--r-- | ports/freerdp/portfile.cmake | 3 |
3 files changed, 29 insertions, 2 deletions
diff --git a/ports/freerdp/CONTROL b/ports/freerdp/CONTROL index 3a24bd998..192a19f88 100644 --- a/ports/freerdp/CONTROL +++ b/ports/freerdp/CONTROL @@ -1,5 +1,5 @@ Source: freerdp -Version: 2.0.0-rc4-4 +Version: 2.0.0-rc4-5 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-install-path.patch b/ports/freerdp/fix-include-install-path.patch new file mode 100644 index 000000000..305cb3cde --- /dev/null +++ b/ports/freerdp/fix-include-install-path.patch @@ -0,0 +1,26 @@ +diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
+index a020dc5..0bc1157 100644
+--- a/include/CMakeLists.txt
++++ b/include/CMakeLists.txt
+@@ -19,7 +19,7 @@
+
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/freerdp/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/freerdp/version.h)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/freerdp/build-config.h.in ${CMAKE_CURRENT_BINARY_DIR}/freerdp/build-config.h)
+-set(FREERDP_INSTALL_INCLUDE_DIR include/freerdp${FREERDP_VERSION_MAJOR}/freerdp)
++set(FREERDP_INSTALL_INCLUDE_DIR include/freerdp)
+
+ file(GLOB FREERDP_HEADERS "freerdp/*.h")
+ install(FILES ${FREERDP_HEADERS} DESTINATION ${FREERDP_INSTALL_INCLUDE_DIR} COMPONENT headers)
+diff --git a/winpr/include/CMakeLists.txt b/winpr/include/CMakeLists.txt
+index 452383d..3faab0c 100644
+--- a/winpr/include/CMakeLists.txt
++++ b/winpr/include/CMakeLists.txt
+@@ -17,7 +17,7 @@
+
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/winpr/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/winpr/version.h)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/winpr/wtypes.h.in ${CMAKE_CURRENT_BINARY_DIR}/winpr/wtypes.h)
+-set(WINPR_INSTALL_INCLUDE_DIR include/winpr${WINPR_VERSION_MAJOR}/winpr)
++set(WINPR_INSTALL_INCLUDE_DIR include/winpr)
+
+ file(GLOB WINPR_HEADERS "winpr/*.h")
+ install(FILES ${WINPR_HEADERS} DESTINATION ${WINPR_INSTALL_INCLUDE_DIR} COMPONENT headers)
diff --git a/ports/freerdp/portfile.cmake b/ports/freerdp/portfile.cmake index 2164a0669..b41298e23 100644 --- a/ports/freerdp/portfile.cmake +++ b/ports/freerdp/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( DontInstallSystemRuntimeLibs.patch fix-linux-build.patch openssl_threads.patch + fix-include-install-path.patch ) if(VCPKG_CRT_LINKAGE STREQUAL "static") @@ -77,4 +78,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/lib/cmake ${CURRENT_PACKAGES_DIR}/lib/cmake) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file |