diff options
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/vcpkg-cmake/vcpkg.json | 4 | ||||
| -rw-r--r-- | ports/vcpkg-cmake/vcpkg_cmake_configure.cmake | 6 |
2 files changed, 6 insertions, 4 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() |