diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-09-24 21:37:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-24 12:37:17 -0700 |
| commit | 2b02b97a2e6705f7855845fc31d20e7a75e8b43d (patch) | |
| tree | 3d37f04384d0d957097e99f430d210c9854e39ec /scripts/cmake/vcpkg_build_make.cmake | |
| parent | 9ac48a6c493523bd499a0ed613ab080af9246938 (diff) | |
| download | vcpkg-2b02b97a2e6705f7855845fc31d20e7a75e8b43d.tar.gz vcpkg-2b02b97a2e6705f7855845fc31d20e7a75e8b43d.zip | |
[x264] Fix x64-windows-static (#13450)
* try fixing x264
* fix remaining issues
* Remove unnecessary COPY_SOURCE
Diffstat (limited to 'scripts/cmake/vcpkg_build_make.cmake')
| -rw-r--r-- | scripts/cmake/vcpkg_build_make.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/cmake/vcpkg_build_make.cmake b/scripts/cmake/vcpkg_build_make.cmake index 523f0042d..7a3c21117 100644 --- a/scripts/cmake/vcpkg_build_make.cmake +++ b/scripts/cmake/vcpkg_build_make.cmake @@ -70,7 +70,8 @@ function(vcpkg_build_make) set(NO_PARALLEL_MAKE_OPTS ${_bc_MAKE_OPTIONS} -j 1 --trace -f Makefile ${_bc_BUILD_TARGET})
string(REPLACE " " "\\\ " _VCPKG_PACKAGE_PREFIX ${CURRENT_PACKAGES_DIR})
- string(REGEX REPLACE "([a-zA-Z]):/" "/\\1/" _VCPKG_PACKAGE_PREFIX "${_VCPKG_PACKAGE_PREFIX}")
+ # Don't know why '/cygdrive' is suddenly a requirement here. (at least for x264)
+ string(REGEX REPLACE "([a-zA-Z]):/" "/cygdrive/\\1/" _VCPKG_PACKAGE_PREFIX "${_VCPKG_PACKAGE_PREFIX}")
set(INSTALL_OPTS -j ${VCPKG_CONCURRENCY} --trace -f Makefile install DESTDIR=${_VCPKG_PACKAGE_PREFIX})
#TODO: optimize for install-data (release) and install-exec (release/debug)
else()
|