diff --git a/CMake/ImportGdal.cmake b/CMake/ImportGdal.cmake
index d42cc0b28c43fb53d35d6a82ac55a283e6178f1b..80057398d40ba3d7019df28e253218e297f937be 100644
--- a/CMake/ImportGdal.cmake
+++ b/CMake/ImportGdal.cmake
@@ -6,26 +6,17 @@ MARK_AS_ADVANCED(OTB_USE_EXTERNAL_GDAL)
 IF(OTB_USE_EXTERNAL_GDAL)
 
   FIND_PACKAGE(GDAL)
+  MARK_AS_ADVANCED(GDAL_INCLUDE_DIR)
+  MARK_AS_ADVANCED(GDAL_LIBRARY)
   MARK_AS_ADVANCED(GDAL_CONFIG)
 
   IF (NOT GDAL_FOUND)
-    FIND_PATH(GDAL_INCLUDE_DIR NAMES gdal.h PATHS $ENV{GDAL_INCLUDE_DIR} /usr/include/gdal ${OSGEO4W_INCLUDE})
-    FIND_LIBRARY(GDAL_LIBRARY NAMES gdal gdal_i PATHS /usr/lib/gdal ${OSGEO4W_LIB})
+     MESSAGE(FATAL_ERROR
+             "Cannot find GDAL. Set GDAL_INCLUDE_DIR and GDAL_LIBRARY")
   ENDIF(NOT GDAL_FOUND)
-  MARK_AS_ADVANCED(GDAL_INCLUDE_DIR)
-  MARK_AS_ADVANCED(GDAL_LIBRARY)
-
-  IF (NOT GDAL_INCLUDE_DIR)
-  MESSAGE(FATAL_ERROR
-           "Cannot find GDAL include directory. Please set GDAL_INCLUDE_DIR.")
-  ENDIF (NOT GDAL_INCLUDE_DIR)
 
   INCLUDE_DIRECTORIES(${GDAL_INCLUDE_DIR})
 
-  IF (NOT GDAL_LIBRARY)
-    MESSAGE(FATAL_ERROR
-             "Cannot find GDAL library. Please set GDAL_LIBRARY.")
-  ENDIF (NOT GDAL_LIBRARY)
   MESSAGE(STATUS "  GDAL includes : ${GDAL_INCLUDE_DIR}")
   MESSAGE(STATUS "  GDAL library  : ${GDAL_LIBRARY}")