diff options
| author | Sander Cox <sander@paralleldimension.nl> | 2021-07-01 18:21:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-01 09:21:55 -0700 |
| commit | fad4d8eecc5c21aa13ccd6a6ad61fa84121e65fc (patch) | |
| tree | e67ea8fed6d534efc8d5a14e16023511e19c0ccb | |
| parent | 2d15043211a07cf6b32678e168ee919015f7e5c8 (diff) | |
| download | vcpkg-fad4d8eecc5c21aa13ccd6a6ad61fa84121e65fc.tar.gz vcpkg-fad4d8eecc5c21aa13ccd6a6ad61fa84121e65fc.zip | |
[vcpkg] Expand Architecture list with escape chars (#18156)
* Expand Architecture list with escape chars
This expands the architecture lists with escape characters. When
building FAT binaries for macos using multiple architectures in the
values they need to be escaped otherwise they are passed on to CMake
incorrectly #14932
* Adding the architecture fix to vcpkg-cmake port
updating port vcpkg-cmake version
* updated version in baseline
| -rw-r--r-- | ports/vcpkg-cmake/vcpkg.json | 4 | ||||
| -rw-r--r-- | ports/vcpkg-cmake/vcpkg_cmake_configure.cmake | 6 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_configure_cmake.cmake | 7 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/v-/vcpkg-cmake.json | 5 |
5 files changed, 17 insertions, 9 deletions
diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index 8e2ac9ec6..ffda714e3 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,5 +1,5 @@ { "name": "vcpkg-cmake", - "version-date": "2021-02-28", - "port-version": 3 + "version-date": "2021-06-25", + "port-version": 4 } diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake index acc6f3655..beffd32b0 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake @@ -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}" @@ -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}" @@ -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() diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index fdf054e43..1eb50e852 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -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}" @@ -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}" @@ -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() diff --git a/versions/baseline.json b/versions/baseline.json index f24140bc3..e9d829418 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6505,8 +6505,8 @@ "port-version": 0 }, "vcpkg-cmake": { - "baseline": "2021-02-28", - "port-version": 3 + "baseline": "2021-06-25", + "port-version": 4 }, "vcpkg-cmake-config": { "baseline": "2021-05-22", diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index 1f1fb408b..96d5eb75d 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "acc25ec22f8fd8887a865705580b1d6de041616d", + "version-date": "2021-06-25", + "port-version": 4 + }, + { "git-tree": "0e8bb94599a00fd9c61fd0ae524c22a067c21420", "version-date": "2021-02-28", "port-version": 3 |