mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-18 09:43:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[freerdp] Patch out installation of system runtime libs

Browse Source
This commit is contained in:
Alexander Karatarakis 2017-03-21 15:27:13 -07:00
parent 51e4a0112a
commit 9a7a18ea03
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ports/freerdp/DontInstallSystemRuntimeLibs.patch Normal file
View File

@ -0,0 +1,17 @@
diff --git a/CMakeCPack.cmake b/CMakeCPack.cmake
index 6ccfc7d..75479bf 100644
--- a/CMakeCPack.cmake
+++ b/CMakeCPack.cmake
@@ -67,9 +67,9 @@ if(MSVC)
set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
include(InstallRequiredSystemLibraries)
- install(PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}
- DESTINATION ${CMAKE_INSTALL_BINDIR}
- COMPONENT libraries)
+ # install(PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}
+ # DESTINATION ${CMAKE_INSTALL_BINDIR}
+ # COMPONENT libraries)
endif()
endif()

9
ports/freerdp/portfile.cmake
View File

@ -8,11 +8,16 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/FreeRDP-${FREERDP_VERSION_ESCAPED}
vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/FreeRDP/FreeRDP/archive/${FREERDP_VERSION}.tar.gz"
FILENAME "${FREERDP_VERSION}.tar.gz"
FILENAME "freerdp-${FREERDP_VERSION}.tar.gz"
SHA512 ${FREERDP_HASH}
)
vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES ${CMAKE_CURRENT_LIST_DIR}/DontInstallSystemRuntimeLibs.patch
)
if(VCPKG_CRT_LINKAGE STREQUAL static)
set(FREERDP_CRT_LINKAGE -DMSVC_RUNTIME=static)
endif()
@ -38,7 +43,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/winpr2.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/winpr2.dll")
endif()
if(NOT TARGET_TRIPLET MATCHES "uwp")
if(NOT TARGET_TRIPLET MATCHES "uwp")
make_directory("${CURRENT_PACKAGES_DIR}/tools")
file(RENAME "${CURRENT_PACKAGES_DIR}/bin/winpr-hash.exe" "${CURRENT_PACKAGES_DIR}/tools/winpr-hash.exe")
file(RENAME "${CURRENT_PACKAGES_DIR}/bin/winpr-makecert.exe" "${CURRENT_PACKAGES_DIR}/tools/winpr-makecert.exe")