diff --git a/cmake/FindGDAL.cmake b/cmake/FindGDAL.cmake
index 1fee7135d09..23c33d8d7d8 100644
--- a/cmake/FindGDAL.cmake
+++ b/cmake/FindGDAL.cmake
@@ -75,8 +75,8 @@ ELSE(WIN32)
 
       IF (APPLE)
         SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.dylib CACHE STRING INTERNAL)
-      ELSEIF (APPLE)
-        SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.so CACHE STRING INTERNAL)
+      ELSE (APPLE)
+       SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.so CACHE STRING INTERNAL)
       ENDIF (APPLE)
       
     ELSE(GDAL_CONFIG)
@@ -99,8 +99,8 @@ IF (GDAL_FOUND)
 
 ELSE (GDAL_FOUND)
 
-   IF (GDAL_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could not find GDAL")
-   ENDIF (GDAL_FIND_REQUIRED)
+   MESSAGE(GDAL_INCLUDE_DIR=${GDAL_INCLUDE_DIR})
+   MESSAGE(GDAL_LIBRARY=${GDAL_LIBRARY})
+   MESSAGE(FATAL_ERROR "Could not find GDAL")
 
 ENDIF (GDAL_FOUND)