This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via 4105529cbaaff25399714dab2e458d8e32b73a34 (commit) via e6fa6e60f6330ddf60294a0d9a6ed4cb3f27d4c4 (commit) from 591c50c5e7b9ce26fd7064fa75a965ae5ad15076 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4105529cbaaff25399714dab2e458d8e32b73a34 commit 4105529cbaaff25399714dab2e458d8e32b73a34 Merge: 591c50c e6fa6e6 Author: CMake Topic Stage <kwro...@kitware.com> AuthorDate: Fri Aug 22 13:27:46 2014 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Fri Aug 22 13:27:46 2014 -0400 Merge topic 'wxWidgets-cflags' into next e6fa6e60 UsewxWidgets: CFLAGS are expected to be a string here, not a list. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6fa6e60f6330ddf60294a0d9a6ed4cb3f27d4c4 commit e6fa6e60f6330ddf60294a0d9a6ed4cb3f27d4c4 Author: Richard M. Shaw <hobbes1...@gmail.com> AuthorDate: Fri Aug 22 10:27:48 2014 -0500 Commit: Richard M. Shaw <hobbes1...@gmail.com> CommitDate: Fri Aug 22 10:27:48 2014 -0500 UsewxWidgets: CFLAGS are expected to be a string here, not a list. 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 ----------------------------------------------------------------------- Summary of changes: Modules/UsewxWidgets.cmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits