mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-22 18:55:29 +03:00
42 lines
1.7 KiB
Diff
42 lines
1.7 KiB
Diff
From b536580119c59fde78e38d8d6388f2540ecb6cf9 Mon Sep 17 00:00:00 2001
|
|
From: Ian McInerney <ian.s.mcinerney@ieee.org>
|
|
Date: Mon, 13 Feb 2023 21:24:26 +0000
|
|
Subject: [PATCH] Support subrelease field in wxWidgets cmake detection
|
|
|
|
Sometimes wxWidgets increments the subrelease to a non-zero value, and
|
|
since wxPython will report a subrelease, we must ensure we can get the
|
|
subrelease from the wx library properly, otherwise configure will fail
|
|
thinking the library isn't the same version as that used by wxPython.
|
|
|
|
Fixes: https://gitlab.com/kicad/code/kicad/-/issues/13887
|
|
---
|
|
cmake/FindwxWidgets.cmake | 13 +++++++++++--
|
|
1 file changed, 11 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/cmake/FindwxWidgets.cmake b/cmake/FindwxWidgets.cmake
|
|
index 1cf5a4be53..f22ba48812 100644
|
|
--- a/cmake/FindwxWidgets.cmake
|
|
+++ b/cmake/FindwxWidgets.cmake
|
|
@@ -926,8 +926,17 @@ if(wxWidgets_FOUND)
|
|
"\\2" wxWidgets_VERSION_MINOR "${_wx_version_h}" )
|
|
string(REGEX REPLACE "^(.*\n)?#define +wxRELEASE_NUMBER +([0-9]+).*"
|
|
"\\2" wxWidgets_VERSION_PATCH "${_wx_version_h}" )
|
|
- set(wxWidgets_VERSION_STRING
|
|
- "${wxWidgets_VERSION_MAJOR}.${wxWidgets_VERSION_MINOR}.${wxWidgets_VERSION_PATCH}" )
|
|
+ string(REGEX REPLACE "^(.*\n)?#define +wxSUBRELEASE_NUMBER +([0-9]+).*"
|
|
+ "\\2" wxWidgets_VERSION_SUBRELEASE "${_wx_version_h}" )
|
|
+
|
|
+ if( ${wxWidgets_VERSION_SUBRELEASE} GREATER 0 )
|
|
+ set(wxWidgets_VERSION_STRING
|
|
+ "${wxWidgets_VERSION_MAJOR}.${wxWidgets_VERSION_MINOR}.${wxWidgets_VERSION_PATCH}.${wxWidgets_VERSION_SUBRELEASE}" )
|
|
+ else()
|
|
+ set(wxWidgets_VERSION_STRING
|
|
+ "${wxWidgets_VERSION_MAJOR}.${wxWidgets_VERSION_MINOR}.${wxWidgets_VERSION_PATCH}" )
|
|
+ endif()
|
|
+
|
|
DBG_MSG("wxWidgets_VERSION_STRING: ${wxWidgets_VERSION_STRING}")
|
|
endif()
|
|
|
|
--
|
|
GitLab
|
|
|