diff options
| author | Miguel A. Figueroa-Villanueva <miguelf@ieee.org> | 2010-03-07 09:50:49 (GMT) |
|---|---|---|
| committer | Miguel A. Figueroa-Villanueva <miguelf@ieee.org> | 2010-03-07 09:50:49 (GMT) |
| commit | 8f9f6b3ac1850e5b630871fd080360ad6874fb39 (patch) | |
| tree | 1790a89c8268d862835def027baa3272c26c9289 /Modules | |
| parent | b461a687865197384b6986eb21c425a76c35a1d0 (diff) | |
| download | CMake-8f9f6b3ac1850e5b630871fd080360ad6874fb39.zip CMake-8f9f6b3ac1850e5b630871fd080360ad6874fb39.tar.gz CMake-8f9f6b3ac1850e5b630871fd080360ad6874fb39.tar.bz2 | |
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
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindwxWidgets.cmake | 12 |
1 files changed, 10 insertions, 2 deletions
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 |