ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: fix finding vcpkg binary packages on server 

Fix the regex against the file listing module on the server for the
vcpkg binary package list.

Also replace all the dashes in versions with periods for comparison
purposes.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
This commit is contained in:
Rafael Kitover 2023-11-07 18:32:02 +00:00
parent 1af7aa2333
commit 0eb65a0eb3
No known key found for this signature in database
GPG Key ID: 08AB596679D86240
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/Set-Toolchain-vcpkg.cmake
View File

@ -136,6 +136,7 @@ function(vcpkg_is_installed vcpkg_exe pkg_name pkg_version outvar)
set(${outvar} FALSE PARENT_SCOPE) set(${outvar} FALSE PARENT_SCOPE)
string(REGEX REPLACE "-r([0-9]+)\$" ".\\1" pkg_version ${pkg_version}) string(REGEX REPLACE "-r([0-9]+)\$" ".\\1" pkg_version ${pkg_version})
string(REPLACE "-" "." pkg_version ${pkg_version})
if(NOT DEFINED VCPKG_INSTALLED) if(NOT DEFINED VCPKG_INSTALLED)
execute_process( execute_process(
@ -154,6 +155,7 @@ function(vcpkg_is_installed vcpkg_exe pkg_name pkg_version outvar)
set(inst_pkg_version ${CMAKE_MATCH_2}) set(inst_pkg_version ${CMAKE_MATCH_2})
string(REGEX REPLACE "#([0-9]+)\$" ".\\1" inst_pkg_version ${inst_pkg_version}) string(REGEX REPLACE "#([0-9]+)\$" ".\\1" inst_pkg_version ${inst_pkg_version})
string(REPLACE "-" "." inst_pkg_version ${inst_pkg_version})
list(APPEND VCPKG_INSTALLED ${inst_pkg_name} ${inst_pkg_version}) list(APPEND VCPKG_INSTALLED ${inst_pkg_name} ${inst_pkg_version})
math(EXPR VCPKG_INSTALLED_COUNT "${VCPKG_INSTALLED_COUNT} + 1") math(EXPR VCPKG_INSTALLED_COUNT "${VCPKG_INSTALLED_COUNT} + 1")
@ -203,7 +205,7 @@ function(get_binary_packages vcpkg_exe)
unset(binary_packages) unset(binary_packages)
unset(to_install) unset(to_install)
foreach(pkg ${binary_packages_html}) foreach(pkg ${binary_packages_html})
if(NOT pkg MATCHES "^.*<a href=\".[^>]+>([^_]+)_([^_]+)_([^<]+[.]zip)<.*\$") if(NOT pkg MATCHES "<a href=\"([^_]+)_([^_]+)_([^.]+[.]zip)\"")
continue() continue()
endif() endif()
set(pkg "${CMAKE_MATCH_1}_${CMAKE_MATCH_2}_${CMAKE_MATCH_3}") set(pkg "${CMAKE_MATCH_1}_${CMAKE_MATCH_2}_${CMAKE_MATCH_3}")