diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-03-21 15:27:13 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-03-21 15:27:13 -0700 |
| commit | 9a7a18ea032dd4797726016e934cdeff0fca26b3 (patch) | |
| tree | bbcaf571dca622890b4c15c83ac17c8f7ac8c159 | |
| parent | 51e4a0112a206b20d09cf633d73d491675da27a2 (diff) | |
| download | vcpkg-9a7a18ea032dd4797726016e934cdeff0fca26b3.tar.gz vcpkg-9a7a18ea032dd4797726016e934cdeff0fca26b3.zip | |
[freerdp] Patch out installation of system runtime libs
| -rw-r--r-- | ports/freerdp/DontInstallSystemRuntimeLibs.patch | 17 | ||||
| -rw-r--r-- | ports/freerdp/portfile.cmake | 9 |
2 files changed, 24 insertions, 2 deletions
diff --git a/ports/freerdp/DontInstallSystemRuntimeLibs.patch b/ports/freerdp/DontInstallSystemRuntimeLibs.patch new file mode 100644 index 000000000..7a1d542a2 --- /dev/null +++ b/ports/freerdp/DontInstallSystemRuntimeLibs.patch @@ -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() + diff --git a/ports/freerdp/portfile.cmake b/ports/freerdp/portfile.cmake index 1afe44b7a..409f6fce8 100644 --- a/ports/freerdp/portfile.cmake +++ b/ports/freerdp/portfile.cmake @@ -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") |