kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FindGTK2: Remove GTK2_SKIP_MARK_AS_ADVANCED option 

Variables are now automatically marked as advanced by
SelectLibraryConfigurations
This commit is contained in:
Daniele E. Domenichelli 2013-07-25 19:15:09 +02:00 committed by Brad King
parent a874142987
commit 32cf738c98
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Modules/FindGTK2.cmake
View File

@ -28,7 +28,6 @@
# Optional variables you can define prior to calling this module: # Optional variables you can define prior to calling this module:
# #
# GTK2_DEBUG - Enables verbose debugging of the module # GTK2_DEBUG - Enables verbose debugging of the module
# GTK2_SKIP_MARK_AS_ADVANCED - Disable marking cache variables as advanced
# GTK2_ADDITIONAL_SUFFIXES - Allows defining additional directories to # GTK2_ADDITIONAL_SUFFIXES - Allows defining additional directories to
# search for include files # search for include files
# #
@ -76,6 +75,8 @@
# (i.e. MSVC) # (i.e. MSVC)
# * Use the optimized/debug syntax for _LIBRARY and _LIBRARIES variables when # * Use the optimized/debug syntax for _LIBRARY and _LIBRARIES variables when
# appropriate. A new set of _RELEASE variables was also added. # appropriate. A new set of _RELEASE variables was also added.
# * Remove GTK2_SKIP_MARK_AS_ADVANCED option, as now the variables are
# marked as advanced by SelectLibraryConfigurations
# Version 1.4 (10/4/2012) (CMake 2.8.10) # Version 1.4 (10/4/2012) (CMake 2.8.10)
# * 12596: Missing paths for FindGTK2 on NetBSD # * 12596: Missing paths for FindGTK2 on NetBSD
# * 12049: Fixed detection of GTK include files in the lib folder on # * 12049: Fixed detection of GTK include files in the lib folder on
@ -242,9 +243,6 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr)
if(${_var}_INCLUDE_DIR) if(${_var}_INCLUDE_DIR)
set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS} ${${_var}_INCLUDE_DIR} PARENT_SCOPE) set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS} ${${_var}_INCLUDE_DIR} PARENT_SCOPE)
if(NOT GTK2_SKIP_MARK_AS_ADVANCED)
mark_as_advanced(${_var}_INCLUDE_DIR)
endif()
endif() endif()
endfunction() endfunction()
@ -365,11 +363,6 @@ function(_GTK2_FIND_LIBRARY _var _lib _expand_vc _append_version)
select_library_configurations(${_var}) select_library_configurations(${_var})
if(NOT GTK2_SKIP_MARK_AS_ADVANCED)
mark_as_advanced(${_var}_LIBRARY_RELEASE)
mark_as_advanced(${_var}_LIBRARY_DEBUG)
endif()
set(${_var}_LIBRARY ${${_var}_LIBRARY} PARENT_SCOPE) set(${_var}_LIBRARY ${${_var}_LIBRARY} PARENT_SCOPE)
set(GTK2_LIBRARIES ${GTK2_LIBRARIES} ${${_var}_LIBRARY}) set(GTK2_LIBRARIES ${GTK2_LIBRARIES} ${${_var}_LIBRARY})