Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
2863c9fe
O
Opencv
项目概览
Greenplum
/
Opencv
大约 1 年 前同步成功
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2863c9fe
编写于
7月 03, 2017
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #9077 from alalek:cmake_enable_cxx11
上级
37c8f217
3f02f569
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
40 addition
and
9 deletion
+40
-9
CMakeLists.txt
CMakeLists.txt
+7
-9
cmake/OpenCVDetectCXXCompiler.cmake
cmake/OpenCVDetectCXXCompiler.cmake
+20
-0
cmake/checks/cxx11.cpp
cmake/checks/cxx11.cpp
+13
-0
未找到文件。
CMakeLists.txt
浏览文件 @
2863c9fe
...
...
@@ -110,14 +110,12 @@ if(POLICY CMP0056)
cmake_policy
(
SET CMP0056 NEW
)
endif
()
include
(
cmake/OpenCVUtils.cmake
)
if
(
OPENCV_CXX11
)
#cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
set
(
CMAKE_CXX_STANDARD 11
)
set
(
CMAKE_CXX_STANDARD_REQUIRED TRUE
)
if
(
POLICY CMP0067
)
cmake_policy
(
SET CMP0067 NEW
)
endif
()
include
(
cmake/OpenCVUtils.cmake
)
# must go before the project command
ocv_update
(
CMAKE_CONFIGURATION_TYPES
"Debug;Release"
CACHE STRING
"Configs"
FORCE
)
if
(
DEFINED CMAKE_BUILD_TYPE
)
...
...
@@ -149,6 +147,7 @@ endif()
# ----------------------------------------------------------------------------
# Detect compiler and target platform architecture
# ----------------------------------------------------------------------------
OCV_OPTION
(
ENABLE_CXX11
"Enable C++11 compilation mode"
"
${
OPENCV_CXX11
}
"
)
include
(
cmake/OpenCVDetectCXXCompiler.cmake
)
# Add these standard paths to the search paths for FIND_LIBRARY
...
...
@@ -305,7 +304,6 @@ OCV_OPTION(INSTALL_TESTS "Install accuracy and performance test binar
# OpenCV build options
# ===================================================
OCV_OPTION
(
OPENCV_CXX11
"Enable C++11 compilation mode"
OFF
)
OCV_OPTION
(
ENABLE_CCACHE
"Use ccache"
(
UNIX AND NOT IOS
AND
(
CMAKE_GENERATOR MATCHES
"Makefile"
OR CMAKE_GENERATOR MATCHES
"Ninja"
))
)
OCV_OPTION
(
ENABLE_PRECOMPILED_HEADERS
"Use precompiled headers"
ON
IF
(
NOT IOS AND NOT CMAKE_CROSSCOMPILING
)
)
OCV_OPTION
(
ENABLE_SOLUTION_FOLDERS
"Solution folder in Visual Studio or in other IDEs"
(
MSVC_IDE OR CMAKE_GENERATOR MATCHES Xcode
)
)
...
...
@@ -963,8 +961,8 @@ string(STRIP "${OPENCV_COMPILER_STR}" OPENCV_COMPILER_STR)
status
(
""
)
status
(
" C/C++:"
)
status
(
" Built as dynamic libs?:"
BUILD_SHARED_LIBS THEN YES ELSE NO
)
if
(
OPENCV
_CXX11
)
status
(
" C++11:"
"YES"
)
if
(
ENABLE_CXX11 OR HAVE
_CXX11
)
status
(
" C++11:"
HAVE_CXX11 THEN YES ELSE NO
)
endif
()
status
(
" C++ Compiler:"
${
OPENCV_COMPILER_STR
}
)
status
(
" C++ flags (Release):"
${
CMAKE_CXX_FLAGS
}
${
CMAKE_CXX_FLAGS_RELEASE
}
)
...
...
cmake/OpenCVDetectCXXCompiler.cmake
浏览文件 @
2863c9fe
...
...
@@ -182,3 +182,23 @@ if(CMAKE_VERSION VERSION_LESS "3.1")
endif
()
endforeach
()
endif
()
if
(
ENABLE_CXX11
)
#cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
set
(
CMAKE_CXX_STANDARD 11
)
set
(
CMAKE_CXX_STANDARD_REQUIRED TRUE
)
set
(
CMAKE_CXX_EXTENSIONS OFF
)
# use -std=c++11 instead of -std=gnu++11
if
(
XCMAKE_CXX11_COMPILE_FEATURES
)
set
(
HAVE_CXX11 ON
)
endif
()
endif
()
if
(
NOT HAVE_CXX11
)
ocv_check_compiler_flag
(
CXX
""
HAVE_CXX11
"
${
OpenCV_SOURCE_DIR
}
/cmake/checks/cxx11.cpp"
)
if
(
NOT HAVE_CXX11 AND ENABLE_CXX11
)
ocv_check_compiler_flag
(
CXX
"-std=c++11"
HAVE_STD_CXX11
"
${
OpenCV_SOURCE_DIR
}
/cmake/checks/cxx11.cpp"
)
if
(
HAVE_STD_CXX11
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-std=c++11"
)
set
(
HAVE_CXX11 ON
)
endif
()
endif
()
endif
()
cmake/checks/cxx11.cpp
0 → 100644
浏览文件 @
2863c9fe
#if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1600)
// OK
#else
#error "C++11 is not supported"
#endif
static
int
test
()
{
return
0
;
}
int
main
()
{
auto
res
=
test
();
return
res
;
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录