Skip to content

Commit 32a5f20

Browse files
committed
manual fix under build from vcpkg source
Signed-off-by: l.feng <43399351+msclock@users.noreply.github.com>
1 parent fbd8289 commit 32a5f20

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

cmake/vcpkg/bootstrap/vcpkg_bootstrap.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,13 @@ function(_vcpkg_tool_bootstrap vcpkg_root)
8888
string(REPLACE [[elif [ "$ARCH" = "x86_64" ]; then]]
8989
[[elif [ "$ARCH" = "" ]; then]] file_contents
9090
"${file_contents}")
91+
92+
string(
93+
REPLACE
94+
[[(cd "$buildDir" && cmake --build .) || exit 1]]
95+
[[(sed -i 's/InternalFeatureSet separate_features{{FeatureNameCore.to_string(), feature->name}};/InternalFeatureSet separate_features{{FeatureNameCore.to_string()}}; separate_features.push_back(feature->name);/' src/vcpkg/commands.test-features.cpp && cd "$buildDir" && cmake --build .) || exit 1]]
96+
file_contents
97+
"${file_contents}")
9198
file(WRITE "${bootstrap_impl}" "${file_contents}")
9299

93100
execute_process(

template/cmake/vcpkg/bootstrap/vcpkg_bootstrap.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,13 @@ function(_vcpkg_tool_bootstrap vcpkg_root)
8888
string(REPLACE [[elif [ "$ARCH" = "x86_64" ]; then]]
8989
[[elif [ "$ARCH" = "" ]; then]] file_contents
9090
"${file_contents}")
91+
92+
string(
93+
REPLACE
94+
[[(cd "$buildDir" && cmake --build .) || exit 1]]
95+
[[(sed -i 's/InternalFeatureSet separate_features{{FeatureNameCore.to_string(), feature->name}};/InternalFeatureSet separate_features{{FeatureNameCore.to_string()}}; separate_features.push_back(feature->name);/' src/vcpkg/commands.test-features.cpp && cd "$buildDir" && cmake --build .) || exit 1]]
96+
file_contents
97+
"${file_contents}")
9198
file(WRITE "${bootstrap_impl}" "${file_contents}")
9299

93100
execute_process(

0 commit comments

Comments
 (0)