Skip to content

Commit 2f5a7a0

Browse files
chore(deps): update dependency https://github.com/serious-scaffold/ss-cmake to v0.0.19 (#192)
* chore(deps): update dependency https://github.com/serious-scaffold/ss-cmake to v0.0.19 * resolve confilicts Signed-off-by: l.feng <[email protected]> --------- Signed-off-by: l.feng <[email protected]> Co-authored-by: serious-scaffold[bot] <160990600+serious-scaffold[bot]@users.noreply.github.com> Co-authored-by: l.feng <[email protected]>
1 parent 1017141 commit 2f5a7a0

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
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+
message(STATUS "Replace vcpkg sources")
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);/' $srcDir/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(
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
2-
_commit: v0.0.18
2+
_commit: v0.0.19
33
_src_path: https://github.com/serious-scaffold/ss-cmake

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+
message(STATUS "Replace vcpkg sources")
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);/' $srcDir/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)