perf: optimize auto triplet detection (#198)

- optimize auto triplet detection. - remove redundant preset. - use compact mode for vscode cmake plugin. - rename check-on-macos step name. --------- Signed-off-by: msclock <[email protected]>
serious-scaffold · Apr 11, 2024 · fb7ea55 · fb7ea55
1 parent 0ecd63e
commit fb7ea55
Show file tree

Hide file tree

Showing 30 changed files with 36 additions and 490 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -195,7 +195,7 @@ jobs:
           ccache: true
           cppcheck: true
 
-      - name: Install ${{ matrix.compiler }} through brew
+      - name: Install llvm through brew
         if: contains(matrix.compiler, 'llvm')
         run: |
           brew install ${{ matrix.compiler }}

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,6 +1,6 @@
 {
   "cmake.useCMakePresets": "always",
-  "cmake.options.statusBarVisibility": "icon",
+  "cmake.options.statusBarVisibility": "compact",
   "files.exclude": {
     "**/.clangd/**": true
   },

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -10,11 +10,7 @@
     "cmake/presets/x64-linux-llvm.json",
     "cmake/presets/x64-linux-gcc.json",
     "cmake/presets/x64-mingw-dynamic-windows-mingw.json",
-    "cmake/presets/x64-mingw-dynamic-darwin-mingw.json",
-    "cmake/presets/x64-mingw-dynamic-linux-mingw.json",
     "cmake/presets/x64-mingw-static-windows-mingw.json",
-    "cmake/presets/x64-mingw-static-darwin-mingw.json",
-    "cmake/presets/x64-mingw-static-linux-mingw.json",
     "cmake/presets/x64-osx-gcc.json",
     "cmake/presets/x64-osx-llvm.json",
     "cmake/presets/x64-windows-llvm.json",

diff --git a/cmake/presets/default.json b/cmake/presets/default.json
@@ -2,15 +2,13 @@
   "version": 6,
   "include": [
     "base.json",
-    "arch/x64.json",
     "generators/ninja.json"
   ],
   "configurePresets": [
     {
       "name": "default",
       "inherits": [
         "base",
-        "x64",
         "ninja"
       ]
     }

diff --git a/cmake/presets/triplets/x64-linux.json b/cmake/presets/triplets/x64-linux.json
@@ -11,8 +11,7 @@
         "x64"
       ],
       "cacheVariables": {
-        "VCPKG_TARGET_TRIPLET": "x64-linux",
-        "VCPKG_HOST_TRIPLET": "x64-linux"
+        "VCPKG_TARGET_TRIPLET": "x64-linux"
       }
     }
   ]

diff --git a/cmake/presets/triplets/x64-mingw-dynamic.json b/cmake/presets/triplets/x64-mingw-dynamic.json
@@ -12,7 +12,6 @@
       ],
       "cacheVariables": {
         "VCPKG_TARGET_TRIPLET": "x64-mingw-dynamic",
-        "VCPKG_HOST_TRIPLET": "x64-mingw-dynamic",
         "USE_SANITIZER": "OFF"
       }
     }

diff --git a/cmake/presets/triplets/x64-mingw-static.json b/cmake/presets/triplets/x64-mingw-static.json
@@ -12,7 +12,6 @@
       ],
       "cacheVariables": {
         "VCPKG_TARGET_TRIPLET": "x64-mingw-static",
-        "VCPKG_HOST_TRIPLET": "x64-mingw-static",
         "USE_SANITIZER": "OFF"
       }
     }

diff --git a/cmake/presets/triplets/x64-osx.json b/cmake/presets/triplets/x64-osx.json
@@ -11,8 +11,7 @@
         "x64"
       ],
       "cacheVariables": {
-        "VCPKG_TARGET_TRIPLET": "x64-osx",
-        "VCPKG_HOST_TRIPLET": "x64-osx"
+        "VCPKG_TARGET_TRIPLET": "x64-osx"
       }
     }
   ]

diff --git a/cmake/presets/triplets/x64-windows.json b/cmake/presets/triplets/x64-windows.json
@@ -11,8 +11,7 @@
         "x64"
       ],
       "cacheVariables": {
-        "VCPKG_TARGET_TRIPLET": "x64-windows",
-        "VCPKG_HOST_TRIPLET": "x64-windows"
+        "VCPKG_TARGET_TRIPLET": "x64-windows"
       }
     }
   ]

diff --git a/cmake/presets/x64-mingw-dynamic-darwin-mingw.json b/cmake/presets/x64-mingw-dynamic-darwin-mingw.json
diff --git a/cmake/presets/x64-mingw-dynamic-linux-mingw.json b/cmake/presets/x64-mingw-dynamic-linux-mingw.json
diff --git a/cmake/presets/x64-mingw-static-darwin-mingw.json b/cmake/presets/x64-mingw-static-darwin-mingw.json
diff --git a/cmake/presets/x64-mingw-static-linux-mingw.json b/cmake/presets/x64-mingw-static-linux-mingw.json
diff --git a/cmake/vcpkg/bootstrap/vcpkg_chainload_toolchain.cmake b/cmake/vcpkg/bootstrap/vcpkg_chainload_toolchain.cmake
@@ -17,6 +17,8 @@ function(_vcpkg_chainload_toolchain)
     )
   endif()
 
+  # Load toolchain variables from triplet and architecture
+
   string(LENGTH "${VCPKG_TARGET_ARCHITECTURE}-" _prefix_len)
   string(SUBSTRING ${VCPKG_TARGET_TRIPLET} ${_prefix_len} -1 _stripped_string)
   string(REPLACE "-" ";" _triplet_parts "${_stripped_string}")

diff --git a/cmake/vcpkg/bootstrap/vcpkg_load_triplet.cmake b/cmake/vcpkg/bootstrap/vcpkg_load_triplet.cmake
@@ -82,15 +82,14 @@ function(_vcpkg_detect_host_triplet)
         return()
       endif()
     else()
-      find_program(Z_VCPKG_CL cl)
-      if(Z_VCPKG_CL MATCHES "amd64/cl.exe$" OR Z_VCPKG_CL MATCHES "x64/cl.exe$")
+      find_program(_vcpkg_cl cl)
+      if(_vcpkg_cl MATCHES "amd64/cl.exe$" OR _vcpkg_cl MATCHES "x64/cl.exe$")
         set(_detect_target_triplet_arch x64)
-      elseif(Z_VCPKG_CL MATCHES "arm/cl.exe$")
+      elseif(_vcpkg_cl MATCHES "arm/cl.exe$")
         set(_detect_target_triplet_arch arm)
-      elseif(Z_VCPKG_CL MATCHES "arm64/cl.exe$")
+      elseif(_vcpkg_cl MATCHES "arm64/cl.exe$")
         set(_detect_target_triplet_arch arm64)
-      elseif(Z_VCPKG_CL MATCHES "bin/cl.exe$" OR Z_VCPKG_CL MATCHES
-                                                 "x86/cl.exe$")
+      elseif(_vcpkg_cl MATCHES "bin/cl.exe$" OR _vcpkg_cl MATCHES "x86/cl.exe$")
         set(_detect_target_triplet_arch x86)
       elseif(
         CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64"
@@ -114,17 +113,10 @@ function(_vcpkg_detect_host_triplet)
       elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "loongarch64")
         set(_detect_target_triplet_arch loongarch64)
       else()
-        if(Z_VCPKG_CMAKE_IN_TRY_COMPILE)
-          message(
-            STATUS
-              "Unable to determine target architecture, continuing without vcpkg."
-          )
-        else()
-          message(
-            WARNING
-              "Unable to determine target architecture, continuing without vcpkg."
-          )
-        endif()
+        message(
+          WARNING
+            "Unable to determine target architecture, continuing without vcpkg."
+        )
         set(VCPKG_TOOLCHAIN ON)
         cmake_policy(POP)
         return()
@@ -200,6 +192,8 @@ macro(_vcpkg_load_triplet)
     endif()
   endif()
 
+  # Load triplet variables from VCPKG_TARGET_TRIPLET triplet file
+
   set(_triplet "triplets/${VCPKG_TARGET_TRIPLET}.cmake")
   set(_community_triplet "triplets/community/${VCPKG_TARGET_TRIPLET}.cmake")
 

diff --git a/template/.vscode/settings.json b/template/.vscode/settings.json
@@ -1,6 +1,6 @@
 {
   "cmake.useCMakePresets": "always",
-  "cmake.options.statusBarVisibility": "icon",
+  "cmake.options.statusBarVisibility": "compact",
   "files.exclude": {
     "**/.clangd/**": true
   },

diff --git a/template/CMakePresets.json b/template/CMakePresets.json
@@ -10,11 +10,7 @@
     "cmake/presets/x64-linux-llvm.json",
     "cmake/presets/x64-linux-gcc.json",
     "cmake/presets/x64-mingw-dynamic-windows-mingw.json",
-    "cmake/presets/x64-mingw-dynamic-darwin-mingw.json",
-    "cmake/presets/x64-mingw-dynamic-linux-mingw.json",
     "cmake/presets/x64-mingw-static-windows-mingw.json",
-    "cmake/presets/x64-mingw-static-darwin-mingw.json",
-    "cmake/presets/x64-mingw-static-linux-mingw.json",
     "cmake/presets/x64-osx-gcc.json",
     "cmake/presets/x64-osx-llvm.json",
     "cmake/presets/x64-windows-llvm.json",

diff --git a/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/ci.yml.jinja b/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/ci.yml.jinja
@@ -203,7 +203,7 @@ jobs:
           ccache: true
           cppcheck: true
 
-      - name: Install {{ '${{ matrix.compiler }}' }} through brew
+      - name: Install llvm through brew
         if: contains(matrix.compiler, 'llvm')
         run: |
           brew install {{ '${{ matrix.compiler }}' }}