Commit 1918eccc authored by Cédric Traizet's avatar Cédric Traizet

MRG: merge with develop and resolve conflicts

parents f0c07a08 1278e40f

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

#
# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
......
#
# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
......@@ -114,4 +114,10 @@ set(CTEST_CUSTOM_WARNING_EXCEPTION
".*include.mpValue.h.*[Ww]arning.*\\[-Wc\\+\\+11-extensions\\]"
".*itksys.SharedForward.h.*warning.*itksys_shared_forward_to_real.*"
".*include.mpi_portable_platform.h.*warning.*invalid.suffix.on.literal.*"
# Silent latex warnings in ctest
".*LaTeX Warning:.*"
".*Package tabulary Warning:.*"
".*Package rerunfilecheck Warning:.*"
# Silent warning: unknown option after ‘#pragma GCC diagnostic’ kind [-Wpragmas] from GCC 4.9
".*warning: unknown option after \\‘\\#pragma GCC diagnostic\\’ kind \\[-Wpragmas\\]"
)
#
# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
......
#
# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
......
#
# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
......
#
# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
......
#
# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
......
#
# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
......
#
# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
......
#
# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
......
#
# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
......
#
# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
# https://www.orfeo-toolbox.org/
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# - Find Mapnik
# Find the native Mapnik includes and library
#
# MAPNIK_FOUND - True if MAPNIK found.
# MAPNIK_INCLUDE_DIRS - where to find mapnik/map.hpp, etc.
# MAPNIK_LIBRARIES - List of libraries when using MAPNIK
#
find_path( MAPNIK_INCLUDE_DIR mapnik/map.hpp )
find_library( MAPNIK_LIBRARY
NAMES mapnik2 mapnik )
# handle the QUIETLY and REQUIRED arguments and set MAPNIK_FOUND to TRUE if
# all listed variables are TRUE
include( FindPackageHandleStandardArgs )
FIND_PACKAGE_HANDLE_STANDARD_ARGS( Mapnik DEFAULT_MSG MAPNIK_LIBRARY MAPNIK_INCLUDE_DIR )
mark_as_advanced( MAPNIK_INCLUDE_DIR MAPNIK_LIBRARY )
if(MAPNIK_FOUND)
set(MAPNIK_INCLUDE_DIRS ${MAPNIK_INCLUDE_DIR})
set(MAPNIK_LIBRARIES ${MAPNIK_LIBRARY})
else()
set(MAPNIK_INCLUDE_DIRS)
set(MAPNIK_LIBRARIES)
endif()
#
# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
......
#
# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
......
#
# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
......
#
# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
......
#
# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
......
#
# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
......
#
# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
......
#
# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
......
#
# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
......
#
# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
......
#
# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
......
#
# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
......
#
# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
......
#
# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
# Copyright (C) 2005-2019 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox