kicad-developers team mailing list archive
-
kicad-developers team
-
Mailing list archive
-
Message #23099
[PATCH 12/19] FindwxWidgets.cmake: Improve regex for version number matches
---
CMakeModules/FindwxWidgets.cmake | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/CMakeModules/FindwxWidgets.cmake b/CMakeModules/FindwxWidgets.cmake
index eca3466..8c6c333 100644
--- a/CMakeModules/FindwxWidgets.cmake
+++ b/CMakeModules/FindwxWidgets.cmake
@@ -867,11 +867,11 @@ if(wxWidgets_FOUND AND wxWidgets_FIND_VERSION)
file(READ ${_filename} _wx_version_h)
- string(REGEX REPLACE "^(.*\n)?#define wxMAJOR_VERSION[ ]+([0-9]+).*"
+ string(REGEX REPLACE "^(.*\n)?#define +wxMAJOR_VERSION +([0-9]+).*"
"\\2" wxWidgets_VERSION_MAJOR "${_wx_version_h}" )
- string(REGEX REPLACE "^(.*\n)?#define wxMINOR_VERSION[ ]+([0-9]+).*"
+ string(REGEX REPLACE "^(.*\n)?#define +wxMINOR_VERSION +([0-9]+).*"
"\\2" wxWidgets_VERSION_MINOR "${_wx_version_h}" )
- string(REGEX REPLACE "^(.*\n)?#define wxRELEASE_NUMBER[ ]+([0-9]+).*"
+ 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}" )
Follow ups
References
-
[PATCH 00/19] FindwxWidgets.cmake updates
From: Simon Richter, 2016-02-13
-
[PATCH 01/19] FindwxWidgets.cmake: Remove arguments from else() and end*()
From: Simon Richter, 2016-02-13
-
[PATCH 02/19] FindwxWidgets.cmake: remove a few dbg_msg() invocations
From: Simon Richter, 2016-02-13
-
[PATCH 03/19] FindwxWidgets.cmake: Use uppercase for DBG_MSG macro
From: Simon Richter, 2016-02-13
-
[PATCH 04/19] FindwxWidgets.cmake: Show line number in debug output
From: Simon Richter, 2016-02-13
-
[PATCH 05/19] FindwxWidgets.cmake: Use uppercase for macro names
From: Simon Richter, 2016-02-13
-
[PATCH 06/19] FindwxWidgets.cmake: Use lowercase for CMake builtins
From: Simon Richter, 2016-02-13
-
[PATCH 07/19] FindwxWidgets.cmake: Fix indentation
From: Simon Richter, 2016-02-13
-
[PATCH 08/19] FindwxWidgets.cmake: Look for versioned wx-config scripts
From: Simon Richter, 2016-02-13
-
[PATCH 09/19] FindwxWidgets.cmake: documentation for variables
From: Simon Richter, 2016-02-13
-
[PATCH 10/19] FindwxWidgets.cmake: Expect directory layout for MSVC 64 bit
From: Simon Richter, 2016-02-13
-
[PATCH 11/19] FindwxWidgets.cmake: Simplify MATCHES
From: Simon Richter, 2016-02-13