[Cmake-commits] CMake branch, master, updated. 8f9f6b3ac1850e5b630871fd080360ad6874fb39

[cmake-commits at cmake.org]

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, master has been updated
       via  8f9f6b3ac1850e5b630871fd080360ad6874fb39 (commit)
      from  b461a687865197384b6986eb21c425a76c35a1d0 (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=8f9f6b3ac1850e5b630871fd080360ad6874fb39
commit 8f9f6b3ac1850e5b630871fd080360ad6874fb39
Author: Miguel A. Figueroa-Villanueva <miguelf at ieee.org>
Date:   Sun Mar 7 05:50:49 2010 -0400

    BUG #9419: Added wxWidgets_EXCLUDE_COMMON_LIBRARIES option.
    
    This allows the user not to link to the common libraries,
    which are regularly required. The user must specify all
    libraries that he does want to link in the find_package
    line (png tiff jpeg zlib regex expat).
    
    --HG--
    extra : rebase_source : df29f96c957600629a34a1c5fafb8b3d6f274e22

diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
index 478282b..05c6625 100644
--- a/Modules/FindwxWidgets.cmake
+++ b/Modules/FindwxWidgets.cmake
@@ -18,6 +18,10 @@
 #                            (e.g., C:/wxWidgets-2.6.3/lib/vc_lib).
 #  wxWidgets_CONFIGURATION - Configuration to use
 #                            (e.g., msw, mswd, mswu, mswunivud, etc.)
+#  wxWidgets_EXCLUDE_COMMON_LIBRARIES
+#                          - Set to TRUE to exclude linking of
+#                            commonly required libs (e.g., png tiff
+#                            jpeg zlib regex expat).
 # 
 # For unix style it uses the wx-config utility. You can select between
 # debug/release, unicode/ansi, universal/non-universal, and
@@ -213,8 +217,12 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
     ENDIF(wxWidgets_USE_MONOLITHIC)
   ENDIF(NOT wxWidgets_FIND_COMPONENTS)
 
-  # Always add the common required libs.
-  LIST(APPEND wxWidgets_FIND_COMPONENTS ${wxWidgets_COMMON_LIBRARIES})
+  # Add the common (usually required libs) unless
+  # wxWidgets_EXCLUDE_COMMON_LIBRARIES has been set.
+  IF(NOT wxWidgets_EXCLUDE_COMMON_LIBRARIES)
+    LIST(APPEND wxWidgets_FIND_COMPONENTS
+      ${wxWidgets_COMMON_LIBRARIES})
+  ENDIF(NOT wxWidgets_EXCLUDE_COMMON_LIBRARIES)
 
   #-------------------------------------------------------------------
   # WIN32: Helper MACROS

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindwxWidgets.cmake |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake