diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2019-01-23 10:16:11 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-23 10:16:11 -0800 |
| commit | 97e615bbe5eaa745e59240dd722a6673f23b2f9d (patch) | |
| tree | a957e829899fc1c10228ef8b83fee39131653638 | |
| parent | 07f1d2f44b4d8709cfeefaec5b6290b95baf7a64 (diff) | |
| parent | 55ca74d64993eddeed05224564502b9bc2267fff (diff) | |
| download | vcpkg-97e615bbe5eaa745e59240dd722a6673f23b2f9d.tar.gz vcpkg-97e615bbe5eaa745e59240dd722a6673f23b2f9d.zip | |
Merge pull request #5173 from Dagizmo/x265-linux
[x265] Enable Linux compilation
| -rw-r--r-- | ports/x265/CONTROL | 2 | ||||
| -rw-r--r-- | ports/x265/portfile.cmake | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ports/x265/CONTROL b/ports/x265/CONTROL index 537556763..f2185d2f0 100644 --- a/ports/x265/CONTROL +++ b/ports/x265/CONTROL @@ -1,3 +1,3 @@ Source: x265 -Version: 2.9-1 +Version: 2.9-2 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 090a2db22..87f11c4f4 100644 --- a/ports/x265/portfile.cmake +++ b/ports/x265/portfile.cmake @@ -29,7 +29,12 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/x265) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/x265.exe ${CURRENT_PACKAGES_DIR}/tools/x265/x265.exe) + +if(UNIX) + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/x265 ${CURRENT_PACKAGES_DIR}/tools/x265/x265) +elseif(WIN32) + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/x265.exe ${CURRENT_PACKAGES_DIR}/tools/x265/x265.exe) +endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) |