Skip to content
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

[vcpkg] Expand Architecture list with escape chars #18156

Merged
merged 3 commits into from
Jul 1, 2021
Merged

[vcpkg] Expand Architecture list with escape chars #18156

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f42dfc1
Expand Architecture list with escape chars
sandercox May 27, 2021
f5a8226
Adding the architecture fix to vcpkg-cmake port
sandercox Jun 25, 2021
78c3639
updated version in baseline
sandercox Jun 25, 2021
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
4 changes: 2 additions & 2 deletions ports/vcpkg-cmake/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "vcpkg-cmake",
"version-date": "2021-02-28",
"port-version": 3
"version-date": "2021-06-25",
"port-version": 4
}
6 changes: 4 additions & 2 deletions ports/vcpkg-cmake/vcpkg_cmake_configure.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@ function(vcpkg_cmake_configure)
endif()


list(JOIN VCPKG_TARGET_ARCHITECTURE "\;" target_architecture_string)
list(APPEND arg_OPTIONS
"-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}"
"-DVCPKG_TARGET_TRIPLET=${TARGET_TRIPLET}"
Expand All @@ -274,7 +275,7 @@ function(vcpkg_cmake_configure)
"-DVCPKG_LINKER_FLAGS=${VCPKG_LINKER_FLAGS}"
"-DVCPKG_LINKER_FLAGS_RELEASE=${VCPKG_LINKER_FLAGS_RELEASE}"
"-DVCPKG_LINKER_FLAGS_DEBUG=${VCPKG_LINKER_FLAGS_DEBUG}"
"-DVCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}"
"-DVCPKG_TARGET_ARCHITECTURE=${target_architecture_string}"
"-DCMAKE_INSTALL_LIBDIR:STRING=lib"
"-DCMAKE_INSTALL_BINDIR:STRING=bin"
"-D_VCPKG_ROOT_DIR=${VCPKG_ROOT_DIR}"
Expand All @@ -289,7 +290,8 @@ function(vcpkg_cmake_configure)
# Sets configuration variables for macOS builds
foreach(config_var IN ITEMS INSTALL_NAME_DIR OSX_DEPLOYMENT_TARGET OSX_SYSROOT OSX_ARCHITECTURES)
if(DEFINED VCPKG_${config_var})
list(APPEND arg_OPTIONS "-DCMAKE_${config_var}=${VCPKG_${config_var}}")
list(JOIN VCPKG_${config_var} "\;" config_var_value)
list(APPEND arg_OPTIONS "-DCMAKE_${config_var}=${config_var_value}")
endif()
endforeach()

Expand Down
7 changes: 4 additions & 3 deletions scripts/cmake/vcpkg_configure_cmake.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ function(vcpkg_configure_cmake)
endif()
endif()


list(JOIN VCPKG_TARGET_ARCHITECTURE "\;" target_architecure_string)
list(APPEND arg_OPTIONS
"-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}"
"-DVCPKG_TARGET_TRIPLET=${TARGET_TRIPLET}"
Expand All @@ -255,7 +255,7 @@ function(vcpkg_configure_cmake)
"-DVCPKG_LINKER_FLAGS=${VCPKG_LINKER_FLAGS}"
"-DVCPKG_LINKER_FLAGS_RELEASE=${VCPKG_LINKER_FLAGS_RELEASE}"
"-DVCPKG_LINKER_FLAGS_DEBUG=${VCPKG_LINKER_FLAGS_DEBUG}"
"-DVCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}"
"-DVCPKG_TARGET_ARCHITECTURE=${target_architecure_string}"
"-DCMAKE_INSTALL_LIBDIR:STRING=lib"
"-DCMAKE_INSTALL_BINDIR:STRING=bin"
"-D_VCPKG_ROOT_DIR=${VCPKG_ROOT_DIR}"
Expand All @@ -272,7 +272,8 @@ function(vcpkg_configure_cmake)
# Sets configuration variables for macOS builds
foreach(config_var INSTALL_NAME_DIR OSX_DEPLOYMENT_TARGET OSX_SYSROOT OSX_ARCHITECTURES)
if(DEFINED VCPKG_${config_var})
list(APPEND arg_OPTIONS "-DCMAKE_${config_var}=${VCPKG_${config_var}}")
list(JOIN VCPKG_${config_var} "\;" config_var_value)
list(APPEND arg_OPTIONS "-DCMAKE_${config_var}=${config_var_value}")
endif()
endforeach()

Expand Down
5 changes: 5 additions & 0 deletions versions/v-/vcpkg-cmake.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "acc25ec22f8fd8887a865705580b1d6de041616d",
"version-date": "2021-06-25",
"port-version": 4
},
{
"git-tree": "0e8bb94599a00fd9c61fd0ae524c22a067c21420",
"version-date": "2021-02-28",
Expand Down