From 601ee1f735f3d3d7713af734a18c04bfeff6eef2 Mon Sep 17 00:00:00 2001 From: "Miguel A. Figueroa-Villanueva" Date: Sun, 9 May 2010 13:27:58 -0400 Subject: [PATCH] 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. --HG-- extra : rebase_source : 3452c52b92717f181e902abef38c1e2718ce3b27 --- Modules/FindwxWidgets.cmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake index 05c6625a8..85c6568d7 100644 --- a/Modules/FindwxWidgets.cmake +++ b/Modules/FindwxWidgets.cmake @@ -723,10 +723,13 @@ ELSE(wxWidgets_FIND_STYLE STREQUAL "win32") 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}")