mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 19:32:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[msbuild] Hotfix /p:UseEnv=True to be a port-local setting (#11058)

Browse Source 
* Update vcpkg_build_msbuild.cmake

* Update vcpkg_install_msbuild.cmake

* Update CONTROL

* Update CONTROL

* Update portfile.cmake

* Update portfile.cmake

* Update ci.baseline.txt
This commit is contained in:
Voskrese 2020-05-01 01:11:20 +08:00 committed by GitHub
parent 695d2a8a4d
commit b8c5ede662
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/libvpx/CONTROL
View File

@ -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)

1
ports/libvpx/portfile.cmake
View File

@ -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")

2
ports/mpg123/CONTROL
View File

@ -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)

1
ports/mpg123/portfile.cmake
View File

@ -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}
)

1
scripts/cmake/vcpkg_build_msbuild.cmake
View File

@ -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

1
scripts/cmake/vcpkg_install_msbuild.cmake
View File

@ -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