--- /usr/share/cmake-2.8/Modules/FindGDAL.cmake	2011-12-30 17:49:56.000000000 +0100
+++ CMakeModules/FindGDAL.cmake	2013-08-23 11:26:44.588861570 +0200
@@ -42,18 +42,4 @@
 
-FIND_PATH(GDAL_INCLUDE_DIR gdal.h
-  HINTS
-    $ENV{GDAL_DIR}
-    $ENV{GDAL_ROOT}
-  PATH_SUFFIXES
-     include/gdal
-     include/GDAL
-     include
-  PATHS
-      ~/Library/Frameworks/gdal.framework/Headers
-      /Library/Frameworks/gdal.framework/Headers
-      /sw # Fink
-      /opt/local # DarwinPorts
-      /opt/csw # Blastwave
-      /opt
-)
+# EDIT 2013-08-22 use `gdal-config --cflags` to get GDAL_INCLUDE_DIR
+message("Using custom FindGDAL CMakeModule")
 
@@ -84,2 +70,7 @@
         endif()
+        exec_program(${GDAL_CONFIG} ARGS --cflags OUTPUT_VARIABLE GDAL_CONFIG_CFLAGS)
+        if(GDAL_CONFIG_CFLAGS)
+            string(REGEX MATCHALL "-I[^ ]+" _gdal_dashi ${GDAL_CONFIG_CFLAGS})
+            string(REGEX REPLACE "-I" "" _gdal_include "${_gdal_dashi}")
+        endif()
     endif()
@@ -87,2 +78,20 @@
 
+FIND_PATH(GDAL_INCLUDE_DIR gdal.h
+  HINTS
+    ${_gdal_include}
+    $ENV{GDAL_DIR}
+    $ENV{GDAL_ROOT}
+  PATH_SUFFIXES
+     include/gdal
+     include/GDAL
+     include
+  PATHS
+      ~/Library/Frameworks/gdal.framework/Headers
+      /Library/Frameworks/gdal.framework/Headers
+      /sw # Fink
+      /opt/local # DarwinPorts
+      /opt/csw # Blastwave
+      /opt
+)
+
 FIND_LIBRARY(GDAL_LIBRARY 
@@ -102,3 +111,3 @@
 
-include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(GDAL DEFAULT_MSG GDAL_LIBRARY GDAL_INCLUDE_DIR)