diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2020-09-28 08:29:24 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-27 17:29:24 -0700 |
| commit | a989880479cd5a7e4fcd115cbf89b9038938b3b4 (patch) | |
| tree | e2293d0f758df813525d6a52b183b3374d301e34 /ports/freerdp/fix-include-path.patch | |
| parent | 8093da2373e17db5633eb83e1963da92e3f23286 (diff) | |
| download | vcpkg-a989880479cd5a7e4fcd115cbf89b9038938b3b4.tar.gz vcpkg-a989880479cd5a7e4fcd115cbf89b9038938b3b4.zip | |
[freerdp] Update to the latest version (#13709)
Diffstat (limited to 'ports/freerdp/fix-include-path.patch')
| -rw-r--r-- | ports/freerdp/fix-include-path.patch | 34 |
1 files changed, 30 insertions, 4 deletions
diff --git a/ports/freerdp/fix-include-path.patch b/ports/freerdp/fix-include-path.patch index e9efc3bd3..4a9f7d641 100644 --- a/ports/freerdp/fix-include-path.patch +++ b/ports/freerdp/fix-include-path.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 019926901..91973c888 100644 +index 97ba2f9..64a2f33 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -103,7 +103,7 @@ else() +@@ -107,7 +107,7 @@ else() endif() message("FREERDP_VERSION=${FREERDP_VERSION_FULL}") @@ -11,11 +11,24 @@ index 019926901..91973c888 100644 # Compatibility options if(DEFINED STATIC_CHANNELS) +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/CMakeLists.txt b/winpr/CMakeLists.txt -index 2da25a426..b06f718e9 100644 +index a94090a..08b6b88 100644 --- a/winpr/CMakeLists.txt +++ b/winpr/CMakeLists.txt -@@ -193,7 +193,7 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.10") +@@ -215,7 +215,7 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.10") SetFreeRDPCMakeInstallDir(WINPR_CMAKE_INSTALL_DIR "WinPR${WINPR_VERSION_MAJOR}") @@ -24,3 +37,16 @@ index 2da25a426..b06f718e9 100644 configure_package_config_file(WinPRConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/WinPRConfig.cmake INSTALL_DESTINATION ${WINPR_CMAKE_INSTALL_DIR} +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) |