Commit ab886ca6 authored by Julien Michel's avatar Julien Michel
Browse files

MRG

parents d26cb080 415a7c73
# This is the root OTB CMakeLists file.
# $Id$
#
CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
IF(COMMAND CMAKE_POLICY)
CMAKE_POLICY(SET CMP0003 NEW)
ENDIF(COMMAND CMAKE_POLICY)
PROJECT(OTB)
# Path to additional CMake modules
SET(CMAKE_MODULE_PATH
${CMAKE_SOURCE_DIR}/CMake
${CMAKE_MODULE_PATH})
INCLUDE_REGULAR_EXPRESSION("^(otb|itk|vtk|vnl|vcl|vxl|f2c|netlib|ce|itpack|DICOM|meta|png|dbh|tif|jpeg|zlib).*$")
SOURCE_GROUP("XML Files" REGULAR_EXPRESSION "[.]xml$")
......@@ -587,7 +592,7 @@ IF(OTB_USE_EXTERNAL_GDAL)
ENDIF (NOT JPEG_LIBRARY)
ENDIF(GDAL_HAS_JPEG)
# Check if ${GDAL_LIBRARY} has jpeg library
# Check if ${GDAL_LIBRARY} has ogr library
TRY_COMPILE(GDAL_HAS_OGR
${CMAKE_CURRENT_BINARY_DIR}/CMake
${CMAKE_CURRENT_SOURCE_DIR}/CMake/TestGDALHasOGR.cxx
......@@ -727,7 +732,7 @@ ENDMACRO(OTB_DISABLE_FLTK_GENERATED_WARNINGS)
#
IF(APPLE AND NOT FLTK_USE_X)
FIND_PROGRAM(ITK_APPLE_RESOURCE Rez /Developer/Tools)
FIND_FILE(ITK_FLTK_RESOURCE mac.r /usr/local/include/FL)
FIND_FILE(ITK_FLTK_RESOURCE mac.r ${FLTK_DIR}/include/FL)
IF(NOT ITK_FLTK_RESOURCE)
MESSAGE("Fltk resources not found, GUI application will not respond to mouse events")
ENDIF(NOT ITK_FLTK_RESOURCE)
......@@ -880,16 +885,6 @@ MARK_AS_ADVANCED(OTB_STREAM_MAX_SIZE_BUFFER_FOR_STREAMING)
#-----------------------------------------------------------------------------
# Perform a setup of OTB Wrapping. This will provide CMake options for
# individual wrapping as well as determine if CableSwig is required. If it is,
# OTB_NEED_CableSwig will be set. This file also tries to locate CableSwig by
# searching first in the source tree of OTB, and if that fails, it searches
# for a binary built of CableSwig.
#
INCLUDE(${OTB_SOURCE_DIR}/Wrapping/otbWrapSetup.cmake)
#-----------------------------------------------------------------------------
# Option for generate Patented examples !!!
OPTION(OTB_USE_PATENTED "Build patented examples. ITK must be genereted whith patented option (ITK_USE_PATENTED = ON)." OFF)
......@@ -947,8 +942,6 @@ OPTION(BUILD_EXAMPLES "Build the Examples directory." OFF)
SUBDIRS(Utilities Code)
SUBDIRS(Wrapping)
IF (BUILD_EXAMPLES)
SUBDIRS(Examples)
ENDIF (BUILD_EXAMPLES)
......@@ -1014,8 +1007,7 @@ CONFIGURE_FILE(${OTB_SOURCE_DIR}/otbConfigure.h.in
${OTB_BINARY_DIR}/otbConfigure.h)
#-----------------------------------------------------------------------------
# The entire OTB tree should use the same include path, except for the
# Wrapping directory.
# The entire OTB tree should use the same include path
# Create the list of include directories needed for OTB header files.
INCLUDE(${OTB_SOURCE_DIR}/otbIncludeDirectories.cmake)
......
......@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
Copyright (c) CS Systemes d'information. All rights reserved.
See CSCopyright.txt for details.
See CSCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbBinaryImageDensityFunction_h
......
......@@ -7,15 +7,15 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
Copyright (c) Institut Telecom ; Telecom bretagne. All rights reserved.
See ITCopyright.txt for details.
See ITCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbBoxAndWhiskerImageFilter__h
......
......@@ -7,15 +7,15 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
Copyright (c) Institut Telecom ; Telecom bretagne. All rights reserved.
See ITCopyright.txt for details.
See ITCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbBoxAndWhiskerImageFilter__txx
......
......@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbChangeLabelImageFilter_h
......
......@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbChangeLabelImageFilter_txx
......
......@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbClosePathFunctor_h
......
......@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbCorrectPolygonFunctor_h
......
......@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
Copyright (c) CS Systemes d'information. All rights reserved.
See CSCopyright.txt for details.
See CSCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbEdgeDensityImageFilter_h
......
......@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
Copyright (c) CS systèmes d'information. All rights reserved.
See CSCopyright.txt for details.
See CSCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
......
......@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
Copyright (c) CS Systemes d'information. All rights reserved.
See CSCopyright.txt for details.
See CSCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbEdgeDetectorImageFilter_h
......
......@@ -7,14 +7,14 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
Copyright (c) CS systèmes d'information. All rights reserved.
See CSCopyright.txt for details.
See CSCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
......
......@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageListToImageListApplyFilter_h
......
......@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageListToImageListApplyFilter_txx
......
......@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageListToVectorImageFilter_h
......
......@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImageListToVectorImageFilter_txx
......
......@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImportGeoInformationImageFilter_h
......
......@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbImportGeoInformationImageFilter_txx
......
......@@ -7,12 +7,12 @@
Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
See OTBCopyright.txt for details.
See OTBCopyright.txt for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE, See the above copyright notices for more information.
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
#ifndef __otbInnerProductPCAImageFilter_h
......
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