mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-28 00:59:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[freerdp] Fix dynamic library path in cmake files (#10526)

Browse Source 
* [freerdp] Fix dynamic library path in cmake files

* [freerdp] Add warning message when building in non-windows
This commit is contained in:
Jack·Boos·Yu 2020-03-28 10:32:10 +08:00 committed by GitHub
parent 4b822a1388
commit 5e95b08a99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/freerdp/CONTROL
View File

@ -1,5 +1,5 @@
Source: freerdp
Version: 2.0.0-rc4-5
Version: 2.0.0-rc4-6
Homepage: https://github.com/FreeRDP/FreeRDP
Description: A free implementation of the Remote Desktop Protocol (RDP)
Build-Depends: openssl, glib (!windows)

27
ports/freerdp/portfile.cmake
View File

@ -11,6 +11,10 @@ vcpkg_from_github(
fix-include-install-path.patch
)
if (NOT VCPKG_TARGET_IS_WINDOWS)
message(WARNING "${PORT} currently requires the following libraries from the system package manager:\n libxfixes-dev\n")
endif()
if(VCPKG_CRT_LINKAGE STREQUAL "static")
set(FREERDP_CRT_LINKAGE -DMSVC_RUNTIME=static)
endif()
@ -69,9 +73,26 @@ foreach(PACKAGE FreeRDP-Client2 FreeRDP2 WinPR2)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/${PACKAGE} ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/${PACKAGE}_temp/${PACKAGE})
endforeach()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/FreeRDP-Client2_temp/FreeRDP-Client2 TARGET_PATH share/freerdp-client)
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/FreeRDP2_temp/FreeRDP2)
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/WinPR2_temp/WinPR2 TARGET_PATH share/winpr)
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/FreeRDP-Client2_temp/FreeRDP-Client2 TARGET_PATH share/FreeRDP-Client)
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/FreeRDP2_temp/FreeRDP2 TARGET_PATH share/FreeRDP)
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/WinPR2_temp/WinPR2 TARGET_PATH share/WinPR)
vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/WinPR/WinPRTargets-debug.cmake
"debug/lib/winpr2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
"debug/bin/winpr2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
)
vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/WinPR/WinPRTargets-debug.cmake
"debug/lib/winpr-tools2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
"debug/bin/winpr-tools2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
)
vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/WinPR/WinPRTargets-release.cmake
"lib/winpr2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
"bin/winpr2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
)
vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/WinPR/WinPRTargets-release.cmake
"lib/winpr-tools2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
"bin/winpr-tools2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}"
)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include
${CURRENT_PACKAGES_DIR}/debug/share