mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-09 23:30:35 -06:00
Code Issues Packages Projects Releases Wiki Activity

FindwxWidgets: Include hotfix number

Browse Source 
Add it to the wxWidgets_VERSION_STRING when it is not 0.
Include hotfix numbers when searching for installation paths,
for example wxWidgets-3.2.2.1.

Fixes: #24823
This commit is contained in:
Maarten Bent
2023-10-06 21:01:08 +02:00
committed by Brad King
parent 35d90784e9
commit 625023cace
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/FindwxWidgets.cmake
View File

@@ -247,8 +247,14 @@ macro(wx_extract_version)
"\\2" wxWidgets_VERSION_MINOR "${_wx_version_h}" )
string(REGEX REPLACE "^(.*\n)?#define +wxRELEASE_NUMBER +([0-9]+).*"
"\\2" wxWidgets_VERSION_PATCH "${_wx_version_h}" )
string(REGEX REPLACE "^(.*\n)?#define +wxSUBRELEASE_NUMBER +([0-9]+).*"
"\\2" wxWidgets_VERSION_TWEAK "${_wx_version_h}" )
set(wxWidgets_VERSION_STRING
"${wxWidgets_VERSION_MAJOR}.${wxWidgets_VERSION_MINOR}.${wxWidgets_VERSION_PATCH}" )
if(${wxWidgets_VERSION_TWEAK} GREATER 0)
string(APPEND wxWidgets_VERSION_STRING ".${wxWidgets_VERSION_TWEAK}")
endif()
dbg_msg("wxWidgets_VERSION_STRING: ${wxWidgets_VERSION_STRING}")
endmacro()
@@ -460,6 +466,9 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
foreach(version ${wx_versions})
foreach(patch RANGE 15 0 -1)
list(APPEND wx_paths "wxWidgets-${version}.${patch}")
foreach(tweak RANGE 3 1 -1)
list(APPEND wx_paths "wxWidgets-${version}.${patch}.${tweak}")
endforeach()
endforeach()
endforeach()