From fbc74b00b138944fe4eb134fe8193b21fa964121 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Thu, 21 Oct 2021 22:43:44 -0700 Subject: [PATCH] [boost-modular-build-helper] Add quotes to path (#20896) --- ports/boost-modular-build-helper/CMakeLists.txt | 4 ++-- ports/boost-modular-build-helper/vcpkg.json | 2 +- scripts/boost/generate-ports.ps1 | 2 +- versions/b-/boost-modular-build-helper.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt index f4a0f90530..efddc5c914 100644 --- a/ports/boost-modular-build-helper/CMakeLists.txt +++ b/ports/boost-modular-build-helper/CMakeLists.txt @@ -275,11 +275,11 @@ add_custom_target(boost ALL set(SUBDIR ${CMAKE_CURRENT_BINARY_DIR}/stage/lib) install( CODE " -file(GLOB LIBS ${SUBDIR}/*.so.* ${SUBDIR}/*.so ${SUBDIR}/*.a ${SUBDIR}/*.dylib ${SUBDIR}/*.dylib.* ${SUBDIR}/*.lib) +file(GLOB LIBS \"${SUBDIR}/*.so.*\" \"${SUBDIR}/*.so\" \"${SUBDIR}/*.a\" \"${SUBDIR}/*.dylib\" \"${SUBDIR}/*.dylib.*\" \"${SUBDIR}/*.lib\") if(LIBS) file(INSTALL \${LIBS} DESTINATION \"\${CMAKE_INSTALL_PREFIX}/lib\") endif() -file(GLOB DLLS ${SUBDIR}/*.dll) +file(GLOB DLLS \"${SUBDIR}/*.dll\") if(DLLS) file(INSTALL \${DLLS} DESTINATION \"\${CMAKE_INSTALL_PREFIX}/bin\") endif() diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index 71d528590f..fa9a03db29 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,7 +1,7 @@ { "name": "boost-modular-build-helper", "version": "1.77.0", - "port-version": 2, + "port-version": 3, "description": "Internal vcpkg port used to build Boost libraries", "dependencies": [ "boost-uninstall" diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index 361480f040..3e9ec8f6b9 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -28,7 +28,7 @@ $portVersions = @{ "boost-config" = 2; "boost-gil" = 1; "boost-iostreams" = 1; - "boost-modular-build-helper" = 2; + "boost-modular-build-helper" = 3; "boost-odeint" = 1; "boost-python" = 1; "boost-process" = 2; diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index 7985f1f490..0a0fcb81bf 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7cc6728723151712d8007e882bc2ad9a4649b2cf", + "version": "1.77.0", + "port-version": 3 + }, { "git-tree": "9795fd3f465461fea28201a773909b6fd0e3400b", "version": "1.77.0", diff --git a/versions/baseline.json b/versions/baseline.json index 563a0bf6e5..2312fbcb0c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -814,7 +814,7 @@ }, "boost-modular-build-helper": { "baseline": "1.77.0", - "port-version": 2 + "port-version": 3 }, "boost-move": { "baseline": "1.77.0",