Skip to content

[msbuild]fix use UseEnv-True #11058

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ras0219-msft merged 8 commits into from
Apr 30, 2020
Merged

[msbuild]fix use UseEnv-True #11058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
24b533c
Update vcpkg_build_msbuild.cmake
MVoz Apr 27, 2020
81ca1be
Update vcpkg_install_msbuild.cmake
MVoz Apr 27, 2020
cb6e128
Update CONTROL
MVoz Apr 27, 2020
7fc88ed
Update CONTROL
MVoz Apr 27, 2020
e2e43ff
Update portfile.cmake
MVoz Apr 27, 2020
e4da7fc
Update portfile.cmake
MVoz Apr 27, 2020
281a3fc
Update ci.baseline.txt
MVoz Apr 28, 2020
053d7fc
Merge branch 'master' into YASM-Fix-use-of-MSBuild
MVoz Apr 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/libvpx/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 change: 1 addition & 0 deletions ports/libvpx/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion ports/mpg123/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 change: 1 addition & 0 deletions ports/mpg123/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
)
Expand Down
1 change: 0 additions & 1 deletion scripts/cmake/vcpkg_build_msbuild.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion scripts/cmake/vcpkg_install_msbuild.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down