[Performous-commit] Tapio Vierros : Make CMake find libraries' config dirs better when using wierd prefixes.

[Tapio V. <aa...@us...>]

Module: performous
Branch: joinmenu
Commit: 72bbe45b394d875f5252e213d8ac10c1f7270dbc

Author: Tapio Vierros <tap...@gm...>
Date:   Wed Aug  4 19:51:12 2010 +0300

Make CMake find libraries' config dirs better when using wierd prefixes.

Use case: cross-compiling

---

 cmake/Modules/FindGlib.cmake     |    2 +-
 cmake/Modules/FindGlibmm.cmake   |    2 +-
 cmake/Modules/FindLibXML++.cmake |    2 +-
 cmake/Modules/FindLibXML2.cmake  |    1 +
 cmake/Modules/FindSigC++.cmake   |    2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cmake/Modules/FindGlib.cmake b/cmake/Modules/FindGlib.cmake
index 7344dc2..607e593 100644
--- a/cmake/Modules/FindGlib.cmake
+++ b/cmake/Modules/FindGlib.cmake
@@ -21,7 +21,7 @@ find_path(Glib_INCLUDE_DIR
 find_path(GlibConfig_INCLUDE_DIR
   NAMES glibconfig.h
   PATHS ${Glib_PKGCONF_INCLUDE_DIRS} /usr
-  PATH_SUFFIXES lib/glib-2.0/include
+  PATH_SUFFIXES /lib/glib-2.0/include ../lib/glib-2.0/include
 )
 
 # Finally the library itself
diff --git a/cmake/Modules/FindGlibmm.cmake b/cmake/Modules/FindGlibmm.cmake
index 713657d..38f272a 100644
--- a/cmake/Modules/FindGlibmm.cmake
+++ b/cmake/Modules/FindGlibmm.cmake
@@ -25,7 +25,7 @@ find_path(Glibmm_INCLUDE_DIR
 find_path(GlibmmConfig_INCLUDE_DIR
   NAMES glibmmconfig.h
   PATHS ${Glibmm_PKGCONF_INCLUDE_DIRS} /usr
-  PATH_SUFFIXES lib/glibmm-2.4/include
+  PATH_SUFFIXES lib/glibmm-2.4/include ../lib/glibmm-2.4/include
 )
 
 # Finally the library itself
diff --git a/cmake/Modules/FindLibXML++.cmake b/cmake/Modules/FindLibXML++.cmake
index 3eaa0d9..47aafda 100644
--- a/cmake/Modules/FindLibXML++.cmake
+++ b/cmake/Modules/FindLibXML++.cmake
@@ -25,7 +25,7 @@ find_path(LibXML++_INCLUDE_DIR
 find_path(LibXML++Config_INCLUDE_DIR
   NAMES libxml++config.h
   PATHS ${LibXML++_PKGCONF_INCLUDE_DIRS} /usr
-  PATH_SUFFIXES lib/libxml++-2.6/include
+  PATH_SUFFIXES lib/libxml++-2.6/include ../lib/libxml++-2.6/include
 )
 
 # Finally the library itself
diff --git a/cmake/Modules/FindLibXML2.cmake b/cmake/Modules/FindLibXML2.cmake
index fa53219..8163e70 100644
--- a/cmake/Modules/FindLibXML2.cmake
+++ b/cmake/Modules/FindLibXML2.cmake
@@ -16,6 +16,7 @@ find_path(LibXML2_INCLUDE_DIR
   NAMES libxml/xpath.h
   PATHS ${LibXML2_PKGCONF_INCLUDE_DIRS}
   PATHS ${LibXML2_PKGCONF_INCLUDE_DIRS}/libxml2
+  PATH_SUFFIXES libxml2
 )
 
 find_library(LibXML2_LIBRARY
diff --git a/cmake/Modules/FindSigC++.cmake b/cmake/Modules/FindSigC++.cmake
index 307ec6d..24325bd 100644
--- a/cmake/Modules/FindSigC++.cmake
+++ b/cmake/Modules/FindSigC++.cmake
@@ -21,7 +21,7 @@ find_path(SigC++_INCLUDE_DIR
 find_path(SigC++Config_INCLUDE_DIR
   NAMES sigc++config.h
   PATHS ${SigC++_PKGCONF_INCLUDE_DIRS} /usr
-  PATH_SUFFIXES lib/sigc++-2.0/include
+  PATH_SUFFIXES lib/sigc++-2.0/include ../lib/sigc++-2.0/include
 )
 
 # Finally the library itself