perf: conform to vcpkg-cmake-module

msclock · msclock · commit 1cd0277119ca · 2023-10-12T08:26:09.000Z
Signed-off-by: msclock &lt;msclock@qq.com&gt;
diff --git a/ports/cmake-cpm/portfile.cmake b/ports/cmake-cpm/portfile.cmake
@@ -12,7 +12,7 @@ vcpkg_from_github(
 vcpkg_replace_string(${SOURCE_PATH}/cmake/CPM.cmake
                      [[1.0.0-development-version]] ${VERSION})
 
-vcpkg_cmake_module(FILE_LIST ${SOURCE_PATH}/cmake/CPM.cmake)
+vcpkg_cmake_module(PATH_LIST ${SOURCE_PATH}/cmake/CPM.cmake)
 
 file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage
      DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
diff --git a/ports/cmake-cpm/vcpkg.json b/ports/cmake-cpm/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "cmake-cpm",
   "version": "0.38.6",
-  "port-version": 1,
+  "port-version": 2,
   "description": "CMake's missing package manager. A small CMake script for setup-free, cross-platform, reproducible dependency management.",
   "homepage": "https://github.com/cpm-cmake/CPM.cmake",
   "license": "MIT",
diff --git a/ports/cmake-modules/portfile.cmake b/ports/cmake-modules/portfile.cmake
@@ -9,7 +9,8 @@ vcpkg_from_github(
   c34774e2969836e17f76d08480a4979fbf6e4066079e6f53af020bf0db6a55a3b7df35fb4e52b0143371029d9c3744ee373fdde236d8d97a36889778ceb6f883
 )
 
-vcpkg_cmake_module(DIRECTORY_LIST ${SOURCE_PATH}/cmake/)
+file(GLOB items ${SOURCE_PATH}/cmake/*)
+vcpkg_cmake_module(PATH_LIST ${items})
 
 file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage
      DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
diff --git a/ports/cmake-modules/usage b/ports/cmake-modules/usage
@@ -1,6 +1,5 @@
 The package cmake-modules provides modules:
 
     find_package(cmake-modules REQUIRED)
+    # More modules can refer to <https://github.com/msclock/cmake-modules>.
     include(cmake-modules/build/Default)
-
-More modules can refer to <https://github.com/msclock/cmake-modules>.
diff --git a/ports/cmake-modules/vcpkg.json b/ports/cmake-modules/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "cmake-modules",
   "version": "1.0.1",
-  "port-version": 0,
+  "port-version": 1,
   "homepage": "https://github.com/msclock/cmake-modules",
   "description": "Some useful cmake module collection",
   "license": "Apache-2.0",
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2,11 +2,11 @@
   "default": {
     "cmake-cpm": {
       "baseline": "0.38.6",
-      "port-version": 1
+      "port-version": 2
     },
     "cmake-modules": {
       "baseline": "1.0.1",
-      "port-version": 0
+      "port-version": 1
     },
     "vcpkg-cmake-module": {
       "baseline": "2023-10-12",
diff --git a/versions/c-/cmake-cpm.json b/versions/c-/cmake-cpm.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "version": "0.38.6",
+      "git-tree": "dc65a569f1b0dc498eeeda181afc96df2a9e8f37",
+      "port-version": 2
+    },
     {
       "version": "0.38.6",
       "git-tree": "2de92725ab7eb097d47dd63d168e068a34e0a62d",
diff --git a/versions/c-/cmake-modules.json b/versions/c-/cmake-modules.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "version": "1.0.1",
+      "git-tree": "ece65b31fcf1ec3b32b8a03365a07915c31da8f2",
+      "port-version": 1
+    },
     {
       "version": "1.0.1",
       "git-tree": "e6311ea2cba3286b5b8785942859a6e97c7135b4",

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "cmake-cpm",`
`3`	`3`	`"version": "0.38.6",`
`4`		`- "port-version": 1,`
	`4`	`+ "port-version": 2,`
`5`	`5`	`"description": "CMake's missing package manager. A small CMake script for setup-free, cross-platform, reproducible dependency management.",`
`6`	`6`	`"homepage": "https://github.com/cpm-cmake/CPM.cmake",`
`7`	`7`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,8 @@ vcpkg_from_github(`
`9`	`9`	`c34774e2969836e17f76d08480a4979fbf6e4066079e6f53af020bf0db6a55a3b7df35fb4e52b0143371029d9c3744ee373fdde236d8d97a36889778ceb6f883`
`10`	`10`	`)`
`11`	`11`
`12`		`-vcpkg_cmake_module(DIRECTORY_LIST ${SOURCE_PATH}/cmake/)`
	`12`	`+file(GLOB items ${SOURCE_PATH}/cmake/*)`
	`13`	`+vcpkg_cmake_module(PATH_LIST ${items})`
`13`	`14`
`14`	`15`	`file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage`
`15`	`16`	`DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "cmake-modules",`
`3`	`3`	`"version": "1.0.1",`
`4`		`- "port-version": 0,`
	`4`	`+ "port-version": 1,`
`5`	`5`	`"homepage": "https://github.com/msclock/cmake-modules",`
`6`	`6`	`"description": "Some useful cmake module collection",`
`7`	`7`	`"license": "Apache-2.0",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,10 @@`
`1`	`1`	`{`
`2`	`2`	`"versions": [`
	`3`	`+ {`
	`4`	`+ "version": "0.38.6",`
	`5`	`+ "git-tree": "dc65a569f1b0dc498eeeda181afc96df2a9e8f37",`
	`6`	`+ "port-version": 2`
	`7`	`+ },`
`3`	`8`	`{`
`4`	`9`	`"version": "0.38.6",`
`5`	`10`	`"git-tree": "2de92725ab7eb097d47dd63d168e068a34e0a62d",`