Commit 8c116515 authored by Manuel Grizonnet's avatar Manuel Grizonnet

WRG: update cmake policies 46 and 54 to NEW

parent 1adcf817
...@@ -23,6 +23,8 @@ cmake_minimum_required(VERSION 3.1.0) ...@@ -23,6 +23,8 @@ cmake_minimum_required(VERSION 3.1.0)
foreach(p foreach(p
CMP0025 # CMake 3.0 CMP0025 # CMake 3.0
CMP0042 # CMake 3.0 CMP0042 # CMake 3.0
CMP0046 # CMake 3.0
CMP0054 # CMake 3.1
CMP0058 # CMake 3.3 CMP0058 # CMake 3.3
CMP0072 # CMake 3.11 CMP0072 # CMake 3.11
) )
...@@ -31,17 +33,6 @@ foreach(p ...@@ -31,17 +33,6 @@ foreach(p
endif() endif()
endforeach() endforeach()
# CMP0046 : from CMake 3.0, old behaviour is more convenient
if(POLICY CMP0046)
cmake_policy(SET CMP0046 OLD)
endif()
# TODO Check if OTB cmake is compatible with CMP0054 NEW policy
# CMP0054 : New policy introduce in CMake 3.1, keep old behaviour for now
if(POLICY CMP0054)
cmake_policy(SET CMP0054 OLD)
endif()
project(OTB) project(OTB)
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 14)
......
...@@ -203,7 +203,6 @@ RCC8GraphFileWriter<TInputGraph> ...@@ -203,7 +203,6 @@ RCC8GraphFileWriter<TInputGraph>
::WriteVertex(std::ofstream& of, VertexDescriptorType index, ::WriteVertex(std::ofstream& of, VertexDescriptorType index,
VertexPointerType vertex) VertexPointerType vertex)
{ {
typedef typename AttributesMapType::iterator IteratorType;
AttributesMapType attr = vertex->GetAttributesMap(); AttributesMapType attr = vertex->GetAttributesMap();
otbMsgDevMacro(<< "RCC8GraphFileWriter: WriteVertex call: " << index); otbMsgDevMacro(<< "RCC8GraphFileWriter: WriteVertex call: " << index);
of << index << " ["; of << index << " [";
......
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