Skip to content
Snippets Groups Projects
Commit 112e533d authored by Manuel Grizonnet's avatar Manuel Grizonnet
Browse files

ENH: remove OTBCheckCpp11Keyword as OTB required now cpp14

parent f48504e3
No related branches found
No related tags found
No related merge requests found
#
# 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
# )
......@@ -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)
......
......@@ -32,8 +32,6 @@ set(CMAKE_MODULE_PATH
include(ExternalProject)
include(OTBCheckCpp11Keywords)
include(OTBCheckTargetSystemArch)
option(BUILD_SHARED_LIBS "Build OTB with shared libraries." ON)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment