MRG

CMakeLists.txt

 # This is the root OTB CMakeLists file.
 # $Id$
 #
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
 IF(COMMAND CMAKE_POLICY)
   CMAKE_POLICY(SET CMP0003 NEW)
 ENDIF(COMMAND CMAKE_POLICY)
@@ -245,7 +245,7 @@ IF(OTB_USE_VISU_GUI)
 
         # Option for internal/external FLTK
         OPTION(OTB_USE_EXTERNAL_FLTK "Use an outside build of FLTK." ON)
-#         MARK_AS_ADVANCED(OTB_USE_EXTERNAL_FLTK)
+        MARK_AS_ADVANCED(OTB_USE_EXTERNAL_FLTK)
         # Add an option to use or not use FLTK (http://www.fltk.org)
         IF(OTB_USE_EXTERNAL_FLTK)
 
@@ -419,7 +419,6 @@ ENDIF (NOT JPEG_LIBRARY)
 ENDIF(GDAL_HAS_JPEG)
 
 # Check if ${GDAL_LIBRARY} has jpeg library
-SET(OGR_LIBRARY ${GDAL_LIBRARY})
 TRY_COMPILE(GDAL_HAS_OGR
 ${CMAKE_CURRENT_BINARY_DIR}/CMake
 ${CMAKE_CURRENT_SOURCE_DIR}/CMake/TestGDALHasOGR.cxx
@@ -427,9 +426,10 @@ CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:PATH=${OGR_INCLUDE_DIRS};${GDAL_INCLUDE_DIRS}
 OUTPUT_VARIABLE OUTPUT)
 IF(GDAL_HAS_OGR)
 MESSAGE(STATUS "Testing if GDAL has OGR     -- yes")
+SET(OGR_LIBRARY ${GDAL_LIBRARY})
 ELSE(GDAL_HAS_OGR)
 MESSAGE(STATUS "Testing if GDAL has OGR     -- no")
-MESSAGE(${OUTPUT})
+MESSAGE(FATAL_ERROR "OGR MESSAGE: ${OUTPUT}")
 FIND_LIBRARY(OGR_LIBRARY ogr PATHS)
 IF (NOT OGR_LIBRARY)
 MESSAGE(FATAL_ERROR