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 | |
| 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')
| -rw-r--r-- | scripts/cmake/vcpkg_build_make.cmake | 3 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_configure_make.cmake | 11 |
2 files changed, 9 insertions, 5 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()
diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 48937a727..668316746 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -220,10 +220,7 @@ function(vcpkg_configure_make) list(APPEND MSYS_REQUIRE_PACKAGES binutils libtool autoconf automake-wrapper automake1.16 m4)
vcpkg_acquire_msys(MSYS_ROOT PACKAGES ${MSYS_REQUIRE_PACKAGES})
# This inserts msys before system32 (which masks sort.exe and find.exe) but after MSVC (which avoids masking link.exe)
- string(REPLACE ";$ENV{SystemRoot}\\System32;" ";${MSYS_ROOT}/usr/share/automake-1.16;${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\System32;" NEWPATH "$ENV{PATH}")
- set(ENV{PATH} "${NEWPATH}")
- set(BASH "${MSYS_ROOT}/usr/bin/bash.exe")
-
+ set(APPEND_ENV)
if (_csc_AUTOCONFIG)
# --build: the machine you are building on
# --host: the machine you are building for
@@ -243,8 +240,14 @@ function(vcpkg_configure_make) endif()
endif()
debug_message("Using make triplet: ${_csc_BUILD_TRIPLET}")
+ set(APPEND_ENV ";${MSYS_ROOT}/usr/share/automake-1.16")
endif()
+ string(REPLACE ";$ENV{SystemRoot}\\System32;" "${APPEND_ENV};${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\System32;" NEWPATH "$ENV{PATH}")
+ string(REPLACE ";$ENV{SystemRoot}\\system32;" "${APPEND_ENV};${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\system32;" NEWPATH "$ENV{PATH}")
+ set(ENV{PATH} "${NEWPATH}")
+ set(BASH "${MSYS_ROOT}/usr/bin/bash.exe")
+
macro(_vcpkg_append_to_configure_environment inoutstring var defaultval)
# Allows to overwrite settings in custom triplets via the environment
if(DEFINED ENV{${var}})
|