summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-09-23 14:32:15 (GMT)
committerKitware Robot <kwrobot@kitware.com>2021-09-23 14:32:27 (GMT)
commit272d23579fc852aa1df9897c51ea632512c3f066 (patch)
tree05c94887026f9198c246a06a49e921c3e304c675
parent2452067fb2522937b867af4d6f3e8a843079877a (diff)
parent2f43ba507397a6d13924a592d4ebd86d7df8a2ef (diff)
downloadCMake-272d23579fc852aa1df9897c51ea632512c3f066.zip
CMake-272d23579fc852aa1df9897c51ea632512c3f066.tar.gz
CMake-272d23579fc852aa1df9897c51ea632512c3f066.tar.bz2
Merge topic 'matlab_versions_natural_sort'
2f43ba5073 FindMatlab: Sort available Matlab versions using natural comparison. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6555
-rw-r--r--Modules/FindMatlab.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake
index 12a5fde..e4fcd83 100644
--- a/Modules/FindMatlab.cmake
+++ b/Modules/FindMatlab.cmake
@@ -477,7 +477,7 @@ function(matlab_extract_all_installed_versions_from_registry win64 matlab_versio
if(matlabs_from_registry)
list(REMOVE_DUPLICATES matlabs_from_registry)
- list(SORT matlabs_from_registry)
+ list(SORT matlabs_from_registry COMPARE NATURAL)
list(REVERSE matlabs_from_registry)
endif()
@@ -521,7 +521,7 @@ macro(extract_matlab_versions_from_registry_brute_force matlab_versions)
# we order from more recent to older
if(matlab_supported_versions)
list(REMOVE_DUPLICATES matlab_supported_versions)
- list(SORT matlab_supported_versions)
+ list(SORT matlab_supported_versions COMPARE NATURAL)
list(REVERSE matlab_supported_versions)
endif()