Commit b07a6564 authored by Thomas Feuvrier's avatar Thomas Feuvrier

MRG

parent 1b71d9a0
# This is the root OTB CMakeLists file. # This is the root OTB CMakeLists file.
# $Id$ # $Id$
# #
CMAKE_MINIMUM_REQUIRED(VERSION 2.6) CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
IF(COMMAND CMAKE_POLICY) IF(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0003 NEW) CMAKE_POLICY(SET CMP0003 NEW)
ENDIF(COMMAND CMAKE_POLICY) ENDIF(COMMAND CMAKE_POLICY)
...@@ -245,7 +245,7 @@ IF(OTB_USE_VISU_GUI) ...@@ -245,7 +245,7 @@ IF(OTB_USE_VISU_GUI)
# Option for internal/external FLTK # Option for internal/external FLTK
OPTION(OTB_USE_EXTERNAL_FLTK "Use an outside build of FLTK." ON) 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) # Add an option to use or not use FLTK (http://www.fltk.org)
IF(OTB_USE_EXTERNAL_FLTK) IF(OTB_USE_EXTERNAL_FLTK)
...@@ -419,7 +419,6 @@ ENDIF (NOT JPEG_LIBRARY) ...@@ -419,7 +419,6 @@ ENDIF (NOT JPEG_LIBRARY)
ENDIF(GDAL_HAS_JPEG) ENDIF(GDAL_HAS_JPEG)
# Check if ${GDAL_LIBRARY} has jpeg library # Check if ${GDAL_LIBRARY} has jpeg library
SET(OGR_LIBRARY ${GDAL_LIBRARY})
TRY_COMPILE(GDAL_HAS_OGR TRY_COMPILE(GDAL_HAS_OGR
${CMAKE_CURRENT_BINARY_DIR}/CMake ${CMAKE_CURRENT_BINARY_DIR}/CMake
${CMAKE_CURRENT_SOURCE_DIR}/CMake/TestGDALHasOGR.cxx ${CMAKE_CURRENT_SOURCE_DIR}/CMake/TestGDALHasOGR.cxx
...@@ -427,9 +426,10 @@ CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:PATH=${OGR_INCLUDE_DIRS};${GDAL_INCLUDE_DIRS} ...@@ -427,9 +426,10 @@ CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:PATH=${OGR_INCLUDE_DIRS};${GDAL_INCLUDE_DIRS}
OUTPUT_VARIABLE OUTPUT) OUTPUT_VARIABLE OUTPUT)
IF(GDAL_HAS_OGR) IF(GDAL_HAS_OGR)
MESSAGE(STATUS "Testing if GDAL has OGR -- yes") MESSAGE(STATUS "Testing if GDAL has OGR -- yes")
SET(OGR_LIBRARY ${GDAL_LIBRARY})
ELSE(GDAL_HAS_OGR) ELSE(GDAL_HAS_OGR)
MESSAGE(STATUS "Testing if GDAL has OGR -- no") MESSAGE(STATUS "Testing if GDAL has OGR -- no")
MESSAGE(${OUTPUT}) MESSAGE(FATAL_ERROR "OGR MESSAGE: ${OUTPUT}")
FIND_LIBRARY(OGR_LIBRARY ogr PATHS) FIND_LIBRARY(OGR_LIBRARY ogr PATHS)
IF (NOT OGR_LIBRARY) IF (NOT OGR_LIBRARY)
MESSAGE(FATAL_ERROR MESSAGE(FATAL_ERROR
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment