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
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
Brad Hards
otb
Commits
112e533d
Commit
112e533d
authored
7 years ago
by
Manuel Grizonnet
Browse files
Options
Downloads
Patches
Plain Diff
ENH: remove OTBCheckCpp11Keyword as OTB required now cpp14
parent
f48504e3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMake/OTBCheckCpp11Keywords.cmake
+0
-104
0 additions, 104 deletions
CMake/OTBCheckCpp11Keywords.cmake
CMakeLists.txt
+0
-3
0 additions, 3 deletions
CMakeLists.txt
SuperBuild/CMakeLists.txt
+0
-2
0 additions, 2 deletions
SuperBuild/CMakeLists.txt
with
0 additions
and
109 deletions
CMake/OTBCheckCpp11Keywords.cmake
deleted
100644 → 0
+
0
−
104
View file @
f48504e3
#
# 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.
#
include
(
CheckCXXSourceCompiles
)
set
(
CMAKE_REQUIRED_FLAGS
${
CMAKE_CXX_FLAGS
}
)
unset
(
OTB_HAS_CXX11 CACHE
)
CHECK_CXX_SOURCE_COMPILES
(
"
#ifdef _MSC_VER
#if _MSC_VER <= 1700
#error Compiler is not C++11 compliant
#endif
#else
#if __cplusplus <= 199711L
#error Compiler is not C++11 compliant
#endif
#endif
int main(int argc, char *argv[])
{
return 0;
}
"
OTB_HAS_CXX11
)
CHECK_CXX_SOURCE_COMPILES
(
"
#include <memory>
struct Foo
{
Foo() { }
~Foo() { }
};
int main(int argc, char *argv[])
{
std::unique_ptr<Foo> p(new Foo);
return 0;
}
"
OTB_CXX_HAS_UNIQUE_PTR
)
CHECK_CXX_SOURCE_COMPILES
(
"
struct A
{
A() { }
~A() { }
virtual void foo( ) { }
};
struct B : A
{
B() { }
~B() { }
void foo( ) override { }
};
int main(int argc, char *argv[])
{
A* p = new B;
p->foo();
return 0;
}
"
OTB_CXX_HAS_OVERRIDE_SPECIFIER
)
CHECK_CXX_SOURCE_COMPILES
(
"
#include <cstddef>
int main(int argc, char *argv[])
{
int *p = nullptr;
return 0;
}
"
OTB_CXX_HAS_NULLPTR
)
# try_compile(
# OTB_HAS_CXX11
# ${CMAKE_CURRENT_BINARY_DIR}/CMake
# ${CMAKE_SOURCE_DIR}/CMake/otbTestUniquePtr.cpp
# )
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
0
−
3
View file @
112e533d
...
...
@@ -231,9 +231,6 @@ set(CMAKE_EXE_LINKER_FLAGS "${OTB_REQUIRED_LINK_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}
set
(
CMAKE_SHARED_LINKER_FLAGS
"
${
OTB_REQUIRED_LINK_FLAGS
}
${
CMAKE_SHARED_LINKER_FLAGS
}
"
)
set
(
CMAKE_MODULE_LINKER_FLAGS
"
${
OTB_REQUIRED_LINK_FLAGS
}
${
CMAKE_MODULE_LINKER_FLAGS
}
"
)
# detect some C++11 keywords
include
(
OTBCheckCpp11Keywords
)
# TODO BUILD_TESTING is created by default by CTest.cmake, and is ON by default.
option
(
BUILD_TESTING
"Build the testing tree."
OFF
)
...
...
This diff is collapsed.
Click to expand it.
SuperBuild/CMakeLists.txt
+
0
−
2
View file @
112e533d
...
...
@@ -32,8 +32,6 @@ set(CMAKE_MODULE_PATH
include
(
ExternalProject
)
include
(
OTBCheckCpp11Keywords
)
include
(
OTBCheckTargetSystemArch
)
option
(
BUILD_SHARED_LIBS
"Build OTB with shared libraries."
ON
)
...
...
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