mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-16 03:32:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'FindMatlab-fix-version-without-versioninfoxml' into release-3.28

Browse Source 
694727bb45 FindMatlab: Restore support for versions without VersionInfo.xml

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9151
This commit is contained in:
Brad King
2024-01-16 16:10:17 +00:00
committed by Kitware Robot
parent 01e3eb91b8 694727bb45
commit cce2120428
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Modules/FindMatlab.cmake
View File

@@ -503,6 +503,8 @@ function(matlab_extract_all_installed_versions_from_registry win64 matlab_versio
_Matlab_VersionInfoXML("${_reg}" _matlab_version_tmp)
if(NOT "${_matlab_version_tmp}" STREQUAL "unknown")
list(APPEND matlabs_from_registry ${_matlab_version_tmp})
else()
list(APPEND matlabs_from_registry ${match})
endif()
endforeach()
@@ -1409,21 +1411,20 @@ function(_Matlab_VersionInfoXML matlab_root _version)
set(_ver "unknown")
set(_XMLfile ${matlab_root}/VersionInfo.xml)
if(NOT EXISTS ${_XMLfile})
return()
endif()
if(EXISTS ${_XMLfile})
file(READ ${_XMLfile} versioninfo_string)
file(READ ${_XMLfile} versioninfo_string)
if(versioninfo_string)
# parses "<version>23.2.0.2365128</version>"
string(REGEX MATCH "<version>([0-9]+(\\.[0-9]+)+)</version>"
version_reg_match
${versioninfo_string}
)
if(versioninfo_string)
# parses "<version>23.2.0.2365128</version>"
string(REGEX MATCH "<version>([0-9]+(\\.[0-9]+)+)</version>"
version_reg_match
${versioninfo_string}
)
if(CMAKE_MATCH_1)
set(_ver "${CMAKE_MATCH_1}")
if(CMAKE_MATCH_1)
set(_ver "${CMAKE_MATCH_1}")
endif()
endif()
endif()