# HG changeset patch
# User Miguel A. Figueroa-Villanueva <miguelf@ieee.org>
# Date 1273426078 14400
# Node ID 2110fb83c33d8acc9958748ebf4ce818a4b6e48e
# Parent  fd141b33e935a68d4ba0f9843d28f128cdb8d966
BUG #10209: Fixed FindwxWidget CXX flags parsing error.

Was not removing definition flags (-D...) from cxx flags,
when the definition flag was last in the list returned from
wx-config.

diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
--- a/Modules/FindwxWidgets.cmake
+++ b/Modules/FindwxWidgets.cmake
@@ -723,10 +723,13 @@
 
         DBG_MSG_V("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS}")
 
-        # parse definitions from cxxflags; drop -D* from CXXFLAGS and the -D prefix
+        # parse definitions from cxxflags;
+        #   drop -D* from CXXFLAGS and the -D prefix
         STRING(REGEX MATCHALL "-D[^;]+"
           wxWidgets_DEFINITIONS  "${wxWidgets_CXX_FLAGS}")
-        STRING(REGEX REPLACE "-D[^;]+;" ""
+        STRING(REGEX REPLACE "-D[^;]+(;|$)" ""
+          wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}")
+        STRING(REGEX REPLACE ";$" ""
           wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}")
         STRING(REPLACE "-D" ""
           wxWidgets_DEFINITIONS "${wxWidgets_DEFINITIONS}")