Skip to content

[skia] Fix vswhere.exe can't find VS2017 with -sort #10437

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
dan-shaw merged 2 commits into from
Mar 23, 2020
Merged

[skia] Fix vswhere.exe can't find VS2017 with -sort #10437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
465b384
[skia] Fix vswhere.exe can't find VS2017
LilyWangL Mar 17, 2020
333dfa6
[skia] Use $ENV{VCINSTALLDIR}
LilyWangL Mar 18, 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/skia/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: skia
Version: 2020-02-15
Version: 2020-02-15-1
Homepage: https://skia.org
Description: Skia is an open source 2D graphics library which provides common APIs that work across a variety of hardware and software platforms.
It serves as the graphics engine for Google Chrome and Chrome OS, Android, Mozilla Firefox and Firefox OS, and many other products.
Expand Down
20 changes: 2 additions & 18 deletions ports/skia/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,22 +51,6 @@ endif()
set(OPTIONS_REL "${OPTIONS} is_official_build=true")
set(OPTIONS_DBG "${OPTIONS} is_debug=true")

function(find_msvc_path PATH)
vcpkg_get_program_files_32_bit(PROGRAM_FILES)
file(TO_CMAKE_PATH "${PROGRAM_FILES}" PROGRAM_FILES)
set(VSWHERE "${PROGRAM_FILES}/Microsoft Visual Studio/Installer/vswhere.exe")
execute_process(
COMMAND "${VSWHERE}" -prerelease -legacy -products * -sort -utf8 -property installationPath
WORKING_DIRECTORY "${SOURCE_PATH}"
OUTPUT_VARIABLE OUTPUT_
OUTPUT_STRIP_TRAILING_WHITESPACE
)
string(REGEX REPLACE "\n|(\r\n)" ";" OUTPUT_ "${OUTPUT_}")
list(GET OUTPUT_ 0 OUTPUT_)

set(${PATH} "${OUTPUT_}" PARENT_SCOPE)
endfunction()

if(CMAKE_HOST_WIN32)
# Load toolchains
if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE)
Expand Down Expand Up @@ -95,8 +79,8 @@ if(CMAKE_HOST_WIN32)
set(OPTIONS_REL "${OPTIONS_REL} extra_cflags_c=${SKIA_C_FLAGS_REL} \
extra_cflags_cc=${SKIA_CXX_FLAGS_REL}")

find_msvc_path(WIN_VC)
set(WIN_VC "${WIN_VC}\\VC")
set(WIN_VC "$ENV{VCINSTALLDIR}")
string(REPLACE "\\VC\\" "\\VC" WIN_VC "${WIN_VC}")
set(OPTIONS_DBG "${OPTIONS_DBG} win_vc=\"${WIN_VC}\"")
set(OPTIONS_REL "${OPTIONS_REL} win_vc=\"${WIN_VC}\"")

Expand Down