diff options
| author | Brad King <brad.king@kitware.com> | 2014-08-27 13:04:56 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-08-27 13:04:56 (GMT) |
| commit | 3d95b3979782b05a2227bd3aa081667b100bd30d (patch) | |
| tree | af14860222fe31fceafca804b37a6851b7aa182e /Modules | |
| parent | 869e1a4618db925e3c06746dfaba43241435d129 (diff) | |
| parent | e6fa6e60f6330ddf60294a0d9a6ed4cb3f27d4c4 (diff) | |
| download | CMake-3d95b3979782b05a2227bd3aa081667b100bd30d.zip CMake-3d95b3979782b05a2227bd3aa081667b100bd30d.tar.gz CMake-3d95b3979782b05a2227bd3aa081667b100bd30d.tar.bz2 | |
Merge topic 'wxWidgets-cflags'
e6fa6e60 UsewxWidgets: CFLAGS are expected to be a string here, not a list.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/UsewxWidgets.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Modules/UsewxWidgets.cmake b/Modules/UsewxWidgets.cmake index f2f260d..b3633a6 100644 --- a/Modules/UsewxWidgets.cmake +++ b/Modules/UsewxWidgets.cmake @@ -88,8 +88,11 @@ if (wxWidgets_FOUND) endif() if (wxWidgets_CXX_FLAGS) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${wxWidgets_CXX_FLAGS}") - MSG("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS}") + # Flags are expected to be a string here, not a list. + string(REPLACE ";" " " wxWidgets_CXX_FLAGS_str "${wxWidgets_CXX_FLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${wxWidgets_CXX_FLAGS_str}") + MSG("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS_str}") + unset(wxWidgets_CXX_FLAGS_str) endif() # DEPRECATED JW |