kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'wxWidgets-cflags' 

e6fa6e60 UsewxWidgets: CFLAGS are expected to be a string here, not a list.
This commit is contained in:
Brad King 2014-08-27 09:04:56 -04:00 committed by CMake Topic Stage
parent 869e1a4618 e6fa6e60f6
commit 3d95b39797
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Modules/UsewxWidgets.cmake
View File

@ -88,8 +88,11 @@ if (wxWidgets_FOUND)
endif() endif()
if (wxWidgets_CXX_FLAGS) if (wxWidgets_CXX_FLAGS)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${wxWidgets_CXX_FLAGS}") # Flags are expected to be a string here, not a list.
MSG("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS}") 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() endif()
# DEPRECATED JW # DEPRECATED JW