diff options
| author | Voskrese <10104740+Voskrese@users.noreply.github.com> | 2020-05-01 01:11:20 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-30 10:11:20 -0700 |
| commit | b8c5ede662c774a5e2a10418933075a9f84ccd0c (patch) | |
| tree | 3bd77068e8b97d5104af42e6ceede255135a4162 | |
| parent | 695d2a8a4de7a4065edc514508795d83b5dd4eb3 (diff) | |
| download | vcpkg-b8c5ede662c774a5e2a10418933075a9f84ccd0c.tar.gz vcpkg-b8c5ede662c774a5e2a10418933075a9f84ccd0c.zip | |
[msbuild] Hotfix /p:UseEnv=True to be a port-local setting (#11058)
* Update vcpkg_build_msbuild.cmake
* Update vcpkg_install_msbuild.cmake
* Update CONTROL
* Update CONTROL
* Update portfile.cmake
* Update portfile.cmake
* Update ci.baseline.txt
| -rw-r--r-- | ports/libvpx/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libvpx/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/mpg123/CONTROL | 2 | ||||
| -rw-r--r-- | ports/mpg123/portfile.cmake | 1 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_build_msbuild.cmake | 1 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_install_msbuild.cmake | 1 |
6 files changed, 4 insertions, 4 deletions
diff --git a/ports/libvpx/CONTROL b/ports/libvpx/CONTROL index 2472e88a3..b18dfe6c0 100644 --- a/ports/libvpx/CONTROL +++ b/ports/libvpx/CONTROL @@ -1,5 +1,5 @@ Source: libvpx
-Version: 1.8.1-2
+Version: 1.8.1-3
Homepage: https://github.com/webmproject/libvpx
Description: The reference software implementation for the video coding formats VP8 and VP9.
Supports: !(uwp|arm|arm64|linux|osx)
diff --git a/ports/libvpx/portfile.cmake b/ports/libvpx/portfile.cmake index b513a9623..3eded00d9 100644 --- a/ports/libvpx/portfile.cmake +++ b/ports/libvpx/portfile.cmake @@ -71,6 +71,7 @@ vcpkg_execute_required_process( vcpkg_build_msbuild( PROJECT_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/vpx.vcxproj" + OPTIONS /p:UseEnv=True ) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") diff --git a/ports/mpg123/CONTROL b/ports/mpg123/CONTROL index d1edfde9d..a42cb9ed3 100644 --- a/ports/mpg123/CONTROL +++ b/ports/mpg123/CONTROL @@ -1,5 +1,5 @@ Source: mpg123 -Version: 1.25.8-7 +Version: 1.25.8-8 Homepage: https://sourceforge.net/projects/mpg123/ Description: mpg123 is a real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1, 2 and 3 (MPEG 1.0 layer 3 also known as MP3). Supports: !(uwp|arm) diff --git a/ports/mpg123/portfile.cmake b/ports/mpg123/portfile.cmake index 4b0192742..73e7bb3fa 100644 --- a/ports/mpg123/portfile.cmake +++ b/ports/mpg123/portfile.cmake @@ -47,6 +47,7 @@ set(ENV{PATH} "$ENV{PATH};${YASM_EXE_PATH}") if(VCPKG_TARGET_IS_WINDOWS) vcpkg_build_msbuild( PROJECT_PATH ${SOURCE_PATH}/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj + OPTIONS /p:UseEnv=True RELEASE_CONFIGURATION Release${MPG123_CONFIGURATION}${MPG123_CONFIGURATION_SUFFIX} DEBUG_CONFIGURATION Debug${MPG123_CONFIGURATION}${MPG123_CONFIGURATION_SUFFIX} ) diff --git a/scripts/cmake/vcpkg_build_msbuild.cmake b/scripts/cmake/vcpkg_build_msbuild.cmake index 04e8eb0ed..cfd429da2 100644 --- a/scripts/cmake/vcpkg_build_msbuild.cmake +++ b/scripts/cmake/vcpkg_build_msbuild.cmake @@ -91,7 +91,6 @@ function(vcpkg_build_msbuild) list(APPEND _csc_OPTIONS /t:${_csc_TARGET} - /p:UseEnv=True /p:Platform=${_csc_PLATFORM} /p:PlatformToolset=${_csc_PLATFORM_TOOLSET} /p:VCPkgLocalAppDataDisabled=true diff --git a/scripts/cmake/vcpkg_install_msbuild.cmake b/scripts/cmake/vcpkg_install_msbuild.cmake index 2bfbb7690..db2874a9f 100644 --- a/scripts/cmake/vcpkg_install_msbuild.cmake +++ b/scripts/cmake/vcpkg_install_msbuild.cmake @@ -131,7 +131,6 @@ function(vcpkg_install_msbuild) list(APPEND _csc_OPTIONS /t:${_csc_TARGET} - /p:UseEnv=True /p:Platform=${_csc_PLATFORM} /p:PlatformToolset=${_csc_PLATFORM_TOOLSET} /p:VCPkgLocalAppDataDisabled=true |