fix: export path in vcpkg-cmake-wrapper with subdirectories

msclock · msclock · commit a3891fc478dd · 2023-10-11T16:06:30.000+08:00
Signed-off-by: msclock &lt;msclock@qq.com&gt;
diff --git a/ports/vcpkg-cmake-module/portfile.cmake b/ports/vcpkg-cmake-module/portfile.cmake
@@ -1,5 +1,5 @@
 if(NOT TARGET_TRIPLET STREQUAL _HOST_TRIPLET)
-    message(WARNING "vcpkg-cmake-module is a host-only port; please mark it as a host port in your dependencies.")
+    message(WARNING "${PORT} is a host-only port; please mark it as a host port in your dependencies.")
 endif()
 
 file(INSTALL
diff --git a/ports/vcpkg-cmake-module/vcpkg.json b/ports/vcpkg-cmake-module/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "vcpkg-cmake-module",
   "version-date": "2023-10-11",
-  "port-version": 1,
+  "port-version": 2,
   "license": "MIT"
 }
diff --git a/ports/vcpkg-cmake-module/vcpkg_cmake_module.cmake b/ports/vcpkg-cmake-module/vcpkg_cmake_module.cmake
@@ -47,6 +47,11 @@ function(vcpkg_cmake_module)
   endif()
 
   if(arg_DIRECTORY_LIST)
+    # Delete tail "/"
+    if(arg_DIRECTORY_LIST MATCHES [[(/$)]])
+      string(REGEX REPLACE [[(/$)]] "" arg_DIRECTORY_LIST ${arg_DIRECTORY_LIST})
+    endif()
+
     foreach(_dir "${arg_DIRECTORY_LIST}")
       if(NOT IS_DIRECTORY ${_dir})
         message(
@@ -68,15 +73,15 @@ function(vcpkg_cmake_module)
         LIST_DIRECTORIES ON
         RELATIVE "${_dir}"
         "${_dir}/*")
+
       list(FILTER _dir_itmes EXCLUDE REGEX [[^\.]])
-      message(STATUS ${_dir_itmes})
+
       foreach(_item ${_dir_itmes})
         if(IS_DIRECTORY "${_dir}/${_item}")
           string(
             APPEND
             _export_in_vcpkg_cmake_wrapper
-            "${_export_in_vcpkg_cmake_wrapper}list(APPEND CMAKE_PREFIX_PATH "
-            "\${CMAKE_CURRENT_LIST_DIR}/${_modules_dir_path}/${_dir_name}/${_item})\n"
+            "list(APPEND CMAKE_PREFIX_PATH \${CMAKE_CURRENT_LIST_DIR}/${_modules_path}/${_dir_name}/${_item})\n"
           )
         endif()
       endforeach()
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -6,7 +6,7 @@
     },
     "vcpkg-cmake-module": {
       "baseline": "2023-10-11",
-      "port-version": 1
+      "port-version": 2
     }
   }
 }
diff --git a/versions/v-/vcpkg-cmake-module.json b/versions/v-/vcpkg-cmake-module.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "version-date": "2023-10-11",
+      "git-tree": "b070717c7a2a4af190f9be0622c30c578d8026ef",
+      "port-version": 2
+    },
     {
       "version-date": "2023-10-11",
       "git-tree": "852db71c3ded39767390a021f35ff897a16671d9",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "vcpkg-cmake-module",`
`3`	`3`	`"version-date": "2023-10-11",`
`4`		`- "port-version": 1,`
	`4`	`+ "port-version": 2,`
`5`	`5`	`"license": "MIT"`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`},`
`7`	`7`	`"vcpkg-cmake-module": {`
`8`	`8`	`"baseline": "2023-10-11",`
`9`		`- "port-version": 1`
	`9`	`+ "port-version": 2`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,10 @@`
`1`	`1`	`{`
`2`	`2`	`"versions": [`
	`3`	`+ {`
	`4`	`+ "version-date": "2023-10-11",`
	`5`	`+ "git-tree": "b070717c7a2a4af190f9be0622c30c578d8026ef",`
	`6`	`+ "port-version": 2`
	`7`	`+ },`
`3`	`8`	`{`
`4`	`9`	`"version-date": "2023-10-11",`
`5`	`10`	`"git-tree": "852db71c3ded39767390a021f35ff897a16671d9",`