perf: update ss-cmake to 0.0.18

msclock · msclock · commit f8fd98fc3e79 · 2025-04-22T21:21:06.000+08:00
Signed-off-by: l.feng &lt;43399351+msclock@users.noreply.github.com&gt;
diff --git a/cmake/presets/triplets/x64-mingw-dynamic.json b/cmake/presets/triplets/x64-mingw-dynamic.json
@@ -11,7 +11,8 @@
         "x64"
       ],
       "cacheVariables": {
-        "VCPKG_TARGET_TRIPLET": "x64-mingw-dynamic"
+        "VCPKG_TARGET_TRIPLET": "x64-mingw-dynamic",
+        "VCPKG_HOST_TRIPLET": "x64-mingw-dynamic"
       }
     }
   ]
diff --git a/cmake/presets/triplets/x64-mingw-static.json b/cmake/presets/triplets/x64-mingw-static.json
@@ -11,7 +11,8 @@
         "x64"
       ],
       "cacheVariables": {
-        "VCPKG_TARGET_TRIPLET": "x64-mingw-static"
+        "VCPKG_TARGET_TRIPLET": "x64-mingw-static",
+        "VCPKG_HOST_TRIPLET": "x64-mingw-static"
       }
     }
   ]
diff --git a/cmake/presets/x64-mingw-dynamic-windows-mingw.json b/cmake/presets/x64-mingw-dynamic-windows-mingw.json
@@ -15,7 +15,6 @@
         "mingw",
         "x64-mingw-dynamic"
       ]
-
     }
   ],
   "buildPresets": [
diff --git a/cmake/vcpkg/bootstrap/vcpkg_bootstrap.cmake b/cmake/vcpkg/bootstrap/vcpkg_bootstrap.cmake
@@ -119,10 +119,6 @@ function(_vcpkg_upgrade vcpkg_root vcpkg_repo vcpkg_ref)
       OUTPUT_VARIABLE safe_directory
       OUTPUT_STRIP_TRAILING_WHITESPACE
       RESULT_VARIABLE result)
-
-    if(NOT result EQUAL "0")
-      message(FATAL_ERROR "failed to get git safe directory")
-    endif()
   endif()
 
   if(NOT DEFINED safe_directory
@@ -131,6 +127,7 @@ function(_vcpkg_upgrade vcpkg_root vcpkg_repo vcpkg_ref)
 
     execute_process(
       COMMAND ${GIT_EXECUTABLE} config --global safe.directory ${vcpkg_root}
+              --append
       WORKING_DIRECTORY ${vcpkg_root}
       RESULT_VARIABLE result)
 
diff --git a/template/.copier-answers.ss-cmake.yml b/template/.copier-answers.ss-cmake.yml
@@ -1,3 +1,3 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: v0.0.16
+_commit: v0.0.18
 _src_path: https://github.com/serious-scaffold/ss-cmake
diff --git a/template/cmake/presets/triplets/x64-mingw-dynamic.json b/template/cmake/presets/triplets/x64-mingw-dynamic.json
@@ -11,7 +11,8 @@
         "x64"
       ],
       "cacheVariables": {
-        "VCPKG_TARGET_TRIPLET": "x64-mingw-dynamic"
+        "VCPKG_TARGET_TRIPLET": "x64-mingw-dynamic",
+        "VCPKG_HOST_TRIPLET": "x64-mingw-dynamic"
       }
     }
   ]
diff --git a/template/cmake/presets/triplets/x64-mingw-static.json b/template/cmake/presets/triplets/x64-mingw-static.json
@@ -11,7 +11,8 @@
         "x64"
       ],
       "cacheVariables": {
-        "VCPKG_TARGET_TRIPLET": "x64-mingw-static"
+        "VCPKG_TARGET_TRIPLET": "x64-mingw-static",
+        "VCPKG_HOST_TRIPLET": "x64-mingw-static"
       }
     }
   ]
diff --git a/template/cmake/presets/x64-mingw-dynamic-windows-mingw.json b/template/cmake/presets/x64-mingw-dynamic-windows-mingw.json
@@ -15,7 +15,6 @@
         "mingw",
         "x64-mingw-dynamic"
       ]
-
     }
   ],
   "buildPresets": [
diff --git a/template/cmake/vcpkg/bootstrap/vcpkg_bootstrap.cmake b/template/cmake/vcpkg/bootstrap/vcpkg_bootstrap.cmake
@@ -119,10 +119,6 @@ function(_vcpkg_upgrade vcpkg_root vcpkg_repo vcpkg_ref)
       OUTPUT_VARIABLE safe_directory
       OUTPUT_STRIP_TRAILING_WHITESPACE
       RESULT_VARIABLE result)
-
-    if(NOT result EQUAL "0")
-      message(FATAL_ERROR "failed to get git safe directory")
-    endif()
   endif()
 
   if(NOT DEFINED safe_directory
@@ -131,6 +127,7 @@ function(_vcpkg_upgrade vcpkg_root vcpkg_repo vcpkg_ref)
 
     execute_process(
       COMMAND ${GIT_EXECUTABLE} config --global safe.directory ${vcpkg_root}
+              --append
       WORKING_DIRECTORY ${vcpkg_root}
       RESULT_VARIABLE result)
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,8 @@`
`11`	`11`	`"x64"`
`12`	`12`	`],`
`13`	`13`	`"cacheVariables": {`
`14`		`- "VCPKG_TARGET_TRIPLET": "x64-mingw-dynamic"`
	`14`	`+ "VCPKG_TARGET_TRIPLET": "x64-mingw-dynamic",`
	`15`	`+ "VCPKG_HOST_TRIPLET": "x64-mingw-dynamic"`
`15`	`16`	`}`
`16`	`17`	`}`
`17`	`18`	`]`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`"mingw",`
`16`	`16`	`"x64-mingw-dynamic"`
`17`	`17`	`]`
`18`		`-`
`19`	`18`	`}`
`20`	`19`	`],`
`21`	`20`	`"buildPresets": [`