Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
otb
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Main Repositories
otb
Commits
8c116515
Commit
8c116515
authored
6 years ago
by
Manuel Grizonnet
Browse files
Options
Downloads
Patches
Plain Diff
WRG: update cmake policies 46 and 54 to NEW
parent
1adcf817
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!621
Release 7.0 (master)
,
!295
Update deprecated cmake policies to NEW
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+2
-11
2 additions, 11 deletions
CMakeLists.txt
Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.hxx
+0
-1
0 additions, 1 deletion
Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.hxx
with
2 additions
and
12 deletions
CMakeLists.txt
+
2
−
11
View file @
8c116515
...
...
@@ -23,6 +23,8 @@ cmake_minimum_required(VERSION 3.1.0)
foreach
(
p
CMP0025
# CMake 3.0
CMP0042
# CMake 3.0
CMP0046
# CMake 3.0
CMP0054
# CMake 3.1
CMP0058
# CMake 3.3
CMP0072
# CMake 3.11
)
...
...
@@ -31,17 +33,6 @@ foreach(p
endif
()
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
)
set
(
CMAKE_CXX_STANDARD 14
)
...
...
This diff is collapsed.
Click to expand it.
Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.hxx
+
0
−
1
View file @
8c116515
...
...
@@ -203,7 +203,6 @@ RCC8GraphFileWriter<TInputGraph>
::
WriteVertex
(
std
::
ofstream
&
of
,
VertexDescriptorType
index
,
VertexPointerType
vertex
)
{
typedef
typename
AttributesMapType
::
iterator
IteratorType
;
AttributesMapType
attr
=
vertex
->
GetAttributesMap
();
otbMsgDevMacro
(
<<
"RCC8GraphFileWriter: WriteVertex call: "
<<
index
);
of
<<
index
<<
" ["
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment