From e69036b746cd8167c6df05f454e89dc062073f64 Mon Sep 17 00:00:00 2001 From: timlinux Date: Tue, 28 Aug 2007 03:52:38 +0000 Subject: [PATCH] Added some extremely clever logic so gdal headers on Gutsy Gibbon are located properly git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7161 c8812cc2-4d05-0410-92ff-de0c093fc19c --- cmake/FindGDAL.cmake | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cmake/FindGDAL.cmake b/cmake/FindGDAL.cmake index 23c33d8d7d8..f4a0fceb24f 100644 --- a/cmake/FindGDAL.cmake +++ b/cmake/FindGDAL.cmake @@ -37,7 +37,14 @@ ELSE(WIN32) EXEC_PROGRAM(${GDAL_CONFIG} ARGS --prefix OUTPUT_VARIABLE GDAL_PREFIX) - SET(GDAL_INCLUDE_DIR ${GDAL_PREFIX}/include CACHE STRING INTERNAL) + #SET(GDAL_INCLUDE_DIR ${GDAL_PREFIX}/include CACHE STRING INTERNAL) + FIND_PATH(GDAL_INCLUDE_DIR + gdal.h + ${GDAL_PREFIX}/include/gdal + ${GDAL_PREFIX}/include + /usr/local/include + /usr/include + ) ## extract link dirs for rpath EXEC_PROGRAM(${GDAL_CONFIG}