aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKuntal Majumder <12135951+hellozee@users.noreply.github.com>2020-06-24 02:27:29 +0530
committerGitHub <noreply@github.com>2020-06-23 13:57:29 -0700
commitc12aa1cd7b7389443d05b3b7fefa42d45693e7a2 (patch)
tree4ded82968040b1c0b3b5a6d395bc9cd918633f41
parent8e9ee5d36c8c741ab56db242e57f232f06a56e7f (diff)
downloadvcpkg-c12aa1cd7b7389443d05b3b7fefa42d45693e7a2.tar.gz
vcpkg-c12aa1cd7b7389443d05b3b7fefa42d45693e7a2.zip
[x265] Delete the bin directory if the platform is Linux (#11903)
* Delete the bin directory if the platform is Linux * Update x265 to 3.2-4
-rw-r--r--ports/x265/CONTROL2
-rw-r--r--ports/x265/portfile.cmake2
2 files changed, 2 insertions, 2 deletions
diff --git a/ports/x265/CONTROL b/ports/x265/CONTROL
index c94ba6801..31ba77050 100644
--- a/ports/x265/CONTROL
+++ b/ports/x265/CONTROL
@@ -1,4 +1,4 @@
Source: x265
-Version: 3.2-3
+Version: 3.2-4
Homepage: https://bitbucket.org/multicoreware/x265
Description: x265 is a H.265 / HEVC video encoder application library, designed to encode video or images into an H.265 / HEVC encoded bitstream.
diff --git a/ports/x265/portfile.cmake b/ports/x265/portfile.cmake
index 08a34eee1..eaef036f1 100644
--- a/ports/x265/portfile.cmake
+++ b/ports/x265/portfile.cmake
@@ -44,7 +44,7 @@ elseif(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsS
file(RENAME ${CURRENT_PACKAGES_DIR}/bin/x265.exe ${CURRENT_PACKAGES_DIR}/tools/x265/x265.exe)
endif()
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR VCPKG_TARGET_IS_LINUX)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
endif()