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

FindGTK2: Rollback lib64 changes which broke header file finding 

The changes in "use PATH_SUFFIXES to simplify find_* calls" on 8/14
regressed important functionality in FindGTK for using find_path to
locate header files in <prefix>/lib/<gtk_package>/include.

The find_path function doesn't search <prefix>/lib only <prefix>/include.
This commit is contained in:
Philip Lowman 2012-10-03 04:45:22 -04:00
parent 47e50423bf
commit b74267745b
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Modules/FindGTK2.cmake
View File

@ -151,7 +151,7 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr)
"_GTK2_FIND_INCLUDE_DIR( ${_var} ${_hdr} )") "_GTK2_FIND_INCLUDE_DIR( ${_var} ${_hdr} )")
endif() endif()
set(_relatives set(_gtk_packages
# If these ever change, things will break. # If these ever change, things will break.
${GTK2_ADDITIONAL_SUFFIXES} ${GTK2_ADDITIONAL_SUFFIXES}
glibmm-2.4 glibmm-2.4
@ -172,8 +172,15 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr)
sigc++-2.0 sigc++-2.0
) )
set(_suffixes include lib) #
foreach(_d ${_relatives}) # NOTE: The following suffixes cause searching for header files in both of
# these directories:
# /usr/include/<pkg>
# /usr/lib/<pkg>/include
#
set(_suffixes)
foreach(_d ${_gtk_packages})
list(APPEND _suffixes ${_d}) list(APPEND _suffixes ${_d})
list(APPEND _suffixes ${_d}/include) # for /usr/lib/gtk-2.0/include list(APPEND _suffixes ${_d}/include) # for /usr/lib/gtk-2.0/include
endforeach() endforeach()
@ -186,15 +193,23 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr)
find_path(${_var} ${_hdr} find_path(${_var} ${_hdr}
PATHS PATHS
/usr/local/lib64 /usr/local/lib64
/usr/local/lib
/usr/lib64 /usr/lib64
/opt/gnome /usr/lib
/opt/openwin /opt/gnome/include
/usr/openwin /opt/gnome/lib
/sw /opt/openwin/include
/opt/local /usr/openwin/lib
ENV GTKMM_BASEPATH /sw/include
[HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path] /sw/lib
[HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path] /opt/local/include
/opt/local/lib
$ENV{GTKMM_BASEPATH}/include
$ENV{GTKMM_BASEPATH}/lib
[HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/include
[HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/lib
[HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/include
[HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/lib
PATH_SUFFIXES PATH_SUFFIXES
${_suffixes} ${_suffixes}
) )