diff options
| author | Miguel A. Figueroa-Villanueva <miguelf@ieee.org> | 2010-05-09 17:27:58 (GMT) |
|---|---|---|
| committer | Miguel A. Figueroa-Villanueva <miguelf@ieee.org> | 2010-05-09 17:27:58 (GMT) |
| commit | 601ee1f735f3d3d7713af734a18c04bfeff6eef2 (patch) | |
| tree | d01a0aecae857533eff4a59b4a7b73eb4bb91226 | |
| parent | e30279e7de830d9e74e0d40716893139901948e2 (diff) | |
| download | CMake-601ee1f735f3d3d7713af734a18c04bfeff6eef2.zip CMake-601ee1f735f3d3d7713af734a18c04bfeff6eef2.tar.gz CMake-601ee1f735f3d3d7713af734a18c04bfeff6eef2.tar.bz2 | |
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
| -rw-r--r-- | Modules/FindwxWidgets.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake index 05c6625..85c6568 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}") |