diff options
| author | Daniele E. Domenichelli <daniele.domenichelli@iit.it> | 2013-07-02 15:39:17 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-07-29 13:40:57 (GMT) |
| commit | 03bd3d12c025ede123a1adad360fc491ad61bd32 (patch) | |
| tree | d88016978fec5ab72a75b76d4e72cfa5fdca1c0b /Modules | |
| parent | 10e54cd6c9437c27b3a758f8de1455086c53fae5 (diff) | |
| download | CMake-03bd3d12c025ede123a1adad360fc491ad61bd32.zip CMake-03bd3d12c025ede123a1adad360fc491ad61bd32.tar.gz CMake-03bd3d12c025ede123a1adad360fc491ad61bd32.tar.bz2 | |
FindGTK2: Use GTK_XXX_LIBRARY_DEBUG libraries in debug mode
If the GTK_XXX_LIBRARY_DEBUG library is available, it is now used when
linking in debug mode XXX.
A new set of variables GTK_XXX_LIBRARY_RELEASE is added and the
original GTK_XXX_LIBRARY uses the optimized/debug syntax.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindGTK2.cmake | 44 |
1 files changed, 27 insertions, 17 deletions
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake index de17f16..9019cc9 100644 --- a/Modules/FindGTK2.cmake +++ b/Modules/FindGTK2.cmake @@ -117,6 +117,9 @@ # _OUT_micro = Micro version number # _gtkversion_hdr = Header file to parse #============================================================= + +include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) + function(_GTK2_GET_VERSION _OUT_major _OUT_minor _OUT_micro _gtkversion_hdr) file(STRINGS ${_gtkversion_hdr} _contents REGEX "#define GTK_M[A-Z]+_VERSION[ \t]+") if(_contents) @@ -325,7 +328,7 @@ function(_GTK2_FIND_LIBRARY _var _lib _expand_vc _append_version) "While searching for ${_var}, our proposed library list is ${_lib_list}") endif() - find_library(${_var} + find_library(${_var}_RELEASE NAMES ${_lib_list} PATHS /opt/gnome/lib @@ -349,24 +352,31 @@ function(_GTK2_FIND_LIBRARY _var _lib _expand_vc _append_version) [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/lib [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/lib ) + endif() - if(${_var} AND ${_var}_DEBUG) - if(NOT GTK2_SKIP_MARK_AS_ADVANCED) - mark_as_advanced(${_var}_DEBUG) - endif() - set(GTK2_LIBRARIES ${GTK2_LIBRARIES} optimized ${${_var}} debug ${${_var}_DEBUG}) - set(GTK2_LIBRARIES ${GTK2_LIBRARIES} PARENT_SCOPE) - endif() - else() - if(NOT GTK2_SKIP_MARK_AS_ADVANCED) - mark_as_advanced(${_var}) - endif() - set(GTK2_LIBRARIES ${GTK2_LIBRARIES} ${${_var}}) - set(GTK2_LIBRARIES ${GTK2_LIBRARIES} PARENT_SCOPE) - # Set debug to release - set(${_var}_DEBUG ${${_var}}) - set(${_var}_DEBUG ${${_var}} PARENT_SCOPE) + # FIXME Do not pass "_LIBRARY" to this function + string(REPLACE "_LIBRARY" "" _var2 ${_var}) + select_library_configurations(${_var2}) + + if(NOT GTK2_SKIP_MARK_AS_ADVANCED) + mark_as_advanced(${_var}_RELEASE) + mark_as_advanced(${_var}_DEBUG) endif() + + set(${_var} ${${_var}} PARENT_SCOPE) + + set(GTK2_LIBRARIES ${GTK2_LIBRARIES} ${${_var}}) + set(GTK2_LIBRARIES ${GTK2_LIBRARIES} PARENT_SCOPE) + + if(GTK2_DEBUG) + message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] " + "${_var}_RELEASE = \"${${_var}_RELEASE}\"") + message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] " + "${_var}_DEBUG = \"${${_var}_DEBUG}\"") + message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] " + "${_var} = \"${${_var}}\"") + endif() + endfunction() #============================================================= |