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 a2dba6692d72375f740e249aec6ee7949c965510 (commit)
via f51eb9cb0c3bc2a38f0c00780f0d8d050d00891f (commit)
from 70092dc57af4574488eb85f48772fda507dfbfc4 (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=a2dba6692d72375f740e249aec6ee7949c965510
commit a2dba6692d72375f740e249aec6ee7949c965510
Merge: 70092dc f51eb9c
Author: Miguel A. Figueroa-Villanueva <migu...@ieee.org>
AuthorDate: Mon Aug 30 19:59:00 2010 -0400
Commit: Miguel A. Figueroa-Villanueva <migu...@ieee.org>
CommitDate: Mon Aug 30 19:59:00 2010 -0400
Merge branch 'FindwxWidgets-fixed-bug-9775' into next
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f51eb9cb0c3bc2a38f0c00780f0d8d050d00891f
commit f51eb9cb0c3bc2a38f0c00780f0d8d050d00891f
Author: Miguel A. Figueroa-Villanueva <migu...@ieee.org>
AuthorDate: Mon Aug 30 19:38:45 2010 -0400
Commit: Miguel A. Figueroa-Villanueva <migu...@ieee.org>
CommitDate: Mon Aug 30 19:38:45 2010 -0400
BUG: #9775 Fixed patch FindwxWidgets-fixed-bug-9775.
Forgot to add new libraries in list of libs to be cleared.
diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
index b7af94a..90818bc 100644
--- a/Modules/FindwxWidgets.cmake
+++ b/Modules/FindwxWidgets.cmake
@@ -331,7 +331,7 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
# Clear all debug or release library paths (arguments are "d" or "").
MACRO(WX_CLEAR_ALL_LIBS _DBG)
# Clear wxWidgets common libraries.
- FOREACH(LIB ${wxWidgets_COMMON_LIBRARIES})
+ FOREACH(LIB ${wxWidgets_COMMON_LIBRARIES} scintilla)
WX_CLEAR_LIB(WX_${LIB}${_DBG})
ENDFOREACH(LIB)
@@ -345,7 +345,8 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
WX_CLEAR_LIB(WX_mono${_DBG})
# Clear wxWidgets multilib libraries.
- FOREACH(LIB core adv aui html media xrc dbgrid gl qa richtext)
+ FOREACH(LIB core adv aui html media xrc dbgrid gl qa richtext
+ stc ribbon propgrid)
WX_CLEAR_LIB(WX_${LIB}${_DBG})
ENDFOREACH(LIB)
ENDMACRO(WX_CLEAR_ALL_LIBS)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindwxWidgets.cmake | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
