Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
f6941928
O
Opencv
项目概览
Greenplum
/
Opencv
11 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
f6941928
编写于
8月 21, 2017
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
cmake: use CMAKE_CXX_COMPILER_VERSION (CMake 2.8.8+)
- '-fvisibility' flag was updated - PVAPI library detection was changed
上级
89172c08
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
19 addition
and
76 deletion
+19
-76
3rdparty/tbb/CMakeLists.txt
3rdparty/tbb/CMakeLists.txt
+2
-2
CMakeLists.txt
CMakeLists.txt
+0
-4
cmake/OpenCVCompilerOptions.cmake
cmake/OpenCVCompilerOptions.cmake
+3
-1
cmake/OpenCVDetectCUDA.cmake
cmake/OpenCVDetectCUDA.cmake
+1
-1
cmake/OpenCVDetectCXXCompiler.cmake
cmake/OpenCVDetectCXXCompiler.cmake
+4
-52
cmake/OpenCVFindLibsVideo.cmake
cmake/OpenCVFindLibsVideo.cmake
+9
-16
未找到文件。
3rdparty/tbb/CMakeLists.txt
浏览文件 @
f6941928
...
...
@@ -71,9 +71,9 @@ if(HAVE_PTHREAD)
add_definitions
(
-DUSE_PTHREAD
)
#required for Unix
endif
()
if
(
CMAKE_COMPILER_IS_GNU
CXX
)
if
(
CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_COMPILER_IS_CLANG
CXX
)
add_definitions
(
-DTBB_USE_GCC_BUILTINS=1
)
#required for ARM GCC
if
(
NOT CMAKE_OPENCV_GCC_VERSION_NUM LESS 60
0
)
if
(
NOT CMAKE_CXX_COMPILER_VERSION LESS 6.
0
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-flifetime-dse=1"
)
# workaround for GCC 6.x
endif
()
endif
()
...
...
CMakeLists.txt
浏览文件 @
f6941928
...
...
@@ -943,10 +943,6 @@ endif()
# ========================== C/C++ options ==========================
if
(
CMAKE_CXX_COMPILER_VERSION
)
set
(
OPENCV_COMPILER_STR
"
${
CMAKE_CXX_COMPILER
}
${
CMAKE_CXX_COMPILER_ARG1
}
(ver
${
CMAKE_CXX_COMPILER_VERSION
}
)"
)
elseif
(
CMAKE_COMPILER_IS_CLANGCXX
)
set
(
OPENCV_COMPILER_STR
"
${
CMAKE_CXX_COMPILER
}
${
CMAKE_CXX_COMPILER_ARG1
}
(ver
${
CMAKE_CLANG_REGEX_VERSION
}
)"
)
elseif
(
CMAKE_COMPILER_IS_GNUCXX
)
set
(
OPENCV_COMPILER_STR
"
${
CMAKE_CXX_COMPILER
}
${
CMAKE_CXX_COMPILER_ARG1
}
(ver
${
CMAKE_GCC_REGEX_VERSION
}
)"
)
else
()
set
(
OPENCV_COMPILER_STR
"
${
CMAKE_CXX_COMPILER
}
${
CMAKE_CXX_COMPILER_ARG1
}
"
)
endif
()
...
...
cmake/OpenCVCompilerOptions.cmake
浏览文件 @
f6941928
...
...
@@ -279,7 +279,9 @@ set(OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEA
set
(
OPENCV_EXTRA_EXE_LINKER_FLAGS_DEBUG
"
${
OPENCV_EXTRA_EXE_LINKER_FLAGS_DEBUG
}
"
CACHE INTERNAL
"Extra linker flags for Debug build"
)
# set default visibility to hidden
if
(
CMAKE_COMPILER_IS_GNUCXX AND CMAKE_OPENCV_GCC_VERSION_NUM GREATER 399
)
if
((
CMAKE_COMPILER_ID STREQUAL
"GNU"
OR CMAKE_COMPILER_ID STREQUAL
"Clang"
)
AND NOT OPENCV_SKIP_VISIBILITY_HIDDEN
AND NOT CMAKE_CXX_FLAGS MATCHES
"-fvisibility"
)
add_extra_compiler_option
(
-fvisibility=hidden
)
add_extra_compiler_option
(
-fvisibility-inlines-hidden
)
endif
()
...
...
cmake/OpenCVDetectCUDA.cmake
浏览文件 @
f6941928
...
...
@@ -220,7 +220,7 @@ if(CUDA_FOUND)
endif
()
# disabled because of multiple warnings during building nvcc auto generated files
if
(
CMAKE_COMPILER_IS_GNUCXX AND CMAKE_
GCC_REGEX
_VERSION VERSION_GREATER
"4.6.0"
)
if
(
CMAKE_COMPILER_IS_GNUCXX AND CMAKE_
CXX_COMPILER
_VERSION VERSION_GREATER
"4.6.0"
)
ocv_warnings_disable
(
CMAKE_CXX_FLAGS -Wunused-but-set-variable
)
endif
()
...
...
cmake/OpenCVDetectCXXCompiler.cmake
浏览文件 @
f6941928
...
...
@@ -45,59 +45,11 @@ if(MSVC AND CMAKE_C_COMPILER MATCHES "icc|icl")
set
(
CV_ICC __INTEL_COMPILER_FOR_WINDOWS
)
endif
()
# ----------------------------------------------------------------------------
# Detect GNU version:
# ----------------------------------------------------------------------------
if
(
CMAKE_COMPILER_IS_CLANGCXX
)
set
(
CMAKE_GCC_REGEX_VERSION
"4.2.1"
)
set
(
CMAKE_OPENCV_GCC_VERSION_MAJOR 4
)
set
(
CMAKE_OPENCV_GCC_VERSION_MINOR 2
)
set
(
CMAKE_OPENCV_GCC_VERSION 42
)
set
(
CMAKE_OPENCV_GCC_VERSION_NUM 402
)
execute_process
(
COMMAND
${
CMAKE_CXX_COMPILER
}
${
CMAKE_CXX_COMPILER_ARG1
}
-v
ERROR_VARIABLE CMAKE_OPENCV_CLANG_VERSION_FULL
ERROR_STRIP_TRAILING_WHITESPACE
)
string
(
REGEX MATCH
"version.*$"
CMAKE_OPENCV_CLANG_VERSION_FULL
"
${
CMAKE_OPENCV_CLANG_VERSION_FULL
}
"
)
string
(
REGEX MATCH
"[0-9]+
\\
.[0-9]+"
CMAKE_CLANG_REGEX_VERSION
"
${
CMAKE_OPENCV_CLANG_VERSION_FULL
}
"
)
elseif
(
CMAKE_COMPILER_IS_GNUCXX
)
execute_process
(
COMMAND
${
CMAKE_CXX_COMPILER
}
${
CMAKE_CXX_COMPILER_ARG1
}
-dumpversion
OUTPUT_VARIABLE CMAKE_OPENCV_GCC_VERSION_FULL
OUTPUT_STRIP_TRAILING_WHITESPACE
)
execute_process
(
COMMAND
${
CMAKE_CXX_COMPILER
}
${
CMAKE_CXX_COMPILER_ARG1
}
-v
ERROR_VARIABLE CMAKE_OPENCV_GCC_INFO_FULL
OUTPUT_STRIP_TRAILING_WHITESPACE
)
# Typical output in CMAKE_OPENCV_GCC_VERSION_FULL: "c+//0 (whatever) 4.2.3 (...)"
# Look for the version number, major.minor.build
string
(
REGEX MATCH
"[0-9]+
\\
.[0-9]+
\\
.[0-9]+"
CMAKE_GCC_REGEX_VERSION
"
${
CMAKE_OPENCV_GCC_VERSION_FULL
}
"
)
if
(
NOT CMAKE_GCC_REGEX_VERSION
)
#major.minor
string
(
REGEX MATCH
"[0-9]+
\\
.[0-9]+"
CMAKE_GCC_REGEX_VERSION
"
${
CMAKE_OPENCV_GCC_VERSION_FULL
}
"
)
endif
()
if
(
CMAKE_GCC_REGEX_VERSION
)
# Split the parts:
string
(
REGEX MATCHALL
"[0-9]+"
CMAKE_OPENCV_GCC_VERSIONS
"
${
CMAKE_GCC_REGEX_VERSION
}
"
)
list
(
GET CMAKE_OPENCV_GCC_VERSIONS 0 CMAKE_OPENCV_GCC_VERSION_MAJOR
)
list
(
GET CMAKE_OPENCV_GCC_VERSIONS 1 CMAKE_OPENCV_GCC_VERSION_MINOR
)
else
()
#compiler returned just the major version number
string
(
REGEX MATCH
"[0-9]+"
CMAKE_GCC_REGEX_VERSION
"
${
CMAKE_OPENCV_GCC_VERSION_FULL
}
"
)
if
(
NOT CMAKE_GCC_REGEX_VERSION
)
#compiler did not return anything reasonable
set
(
CMAKE_GCC_REGEX_VERSION
"0"
)
message
(
WARNING
"GCC version not detected!"
)
endif
()
set
(
CMAKE_OPENCV_GCC_VERSION_MAJOR
${
CMAKE_GCC_REGEX_VERSION
}
)
set
(
CMAKE_OPENCV_GCC_VERSION_MINOR 0
)
endif
()
set
(
CMAKE_OPENCV_GCC_VERSION
${
CMAKE_OPENCV_GCC_VERSION_MAJOR
}${
CMAKE_OPENCV_GCC_VERSION_MINOR
}
)
math
(
EXPR CMAKE_OPENCV_GCC_VERSION_NUM
"
${
CMAKE_OPENCV_GCC_VERSION_MAJOR
}
*100 +
${
CMAKE_OPENCV_GCC_VERSION_MINOR
}
"
)
message
(
STATUS
"Detected version of GNU GCC:
${
CMAKE_OPENCV_GCC_VERSION
}
(
${
CMAKE_OPENCV_GCC_VERSION_NUM
}
)"
)
if
(
NOT DEFINED CMAKE_CXX_COMPILER_VERSION
)
message
(
WARNING
"Compiler version is not available: CMAKE_CXX_COMPILER_VERSION is not set"
)
endif
()
if
(
CMAKE_COMPILER_IS_GNUCXX
)
if
(
WIN32
)
execute_process
(
COMMAND
${
CMAKE_CXX_COMPILER
}
-dumpmachine
OUTPUT_VARIABLE OPENCV_GCC_TARGET_MACHINE
...
...
cmake/OpenCVFindLibsVideo.cmake
浏览文件 @
f6941928
...
...
@@ -89,23 +89,16 @@ if(WITH_PVAPI)
set
(
PVAPI_SDK_SUBDIR arm
)
endif
()
get_filename_component
(
_PVAPI_LIBRARY
"
${
PVAPI_INCLUDE_PATH
}
/../lib-pc"
ABSOLUTE
)
if
(
PVAPI_SDK_SUBDIR
)
set
(
_PVAPI_LIBRARY
"
${
_PVAPI_LIBRARY
}
/
${
PVAPI_SDK_SUBDIR
}
"
)
endif
()
if
(
NOT WIN32 AND CMAKE_COMPILER_IS_GNUCXX
)
set
(
_PVAPI_LIBRARY
"
${
_PVAPI_LIBRARY
}
/
${
CMAKE_OPENCV_GCC_VERSION_MAJOR
}
.
${
CMAKE_OPENCV_GCC_VERSION_MINOR
}
"
)
endif
()
get_filename_component
(
_PVAPI_LIBRARY_HINT
"
${
PVAPI_INCLUDE_PATH
}
/../lib-pc"
ABSOLUTE
)
if
(
WIN32
)
if
(
MINGW
)
set
(
PVAPI_DEFINITIONS
"-DPVDECL=__stdcall"
)
endif
(
MINGW
)
set
(
PVAPI_LIBRARY
"
${
_PVAPI_LIBRARY
}
/PvAPI.lib"
CACHE PATH
"The PvAPI library"
)
else
(
WIN32
)
set
(
PVAPI_LIBRARY
"
${
_PVAPI_LIBRARY
}
/
${
CMAKE_STATIC_LIBRARY_PREFIX
}
PvAPI
${
CMAKE_STATIC_LIBRARY_SUFFIX
}
"
CACHE PATH
"The PvAPI library"
)
endif
(
WIN32
)
if
(
EXISTS
"
${
PVAPI_LIBRARY
}
"
)
find_library
(
PVAPI_LIBRARY NAMES
"PvAPI"
PATHS
"
${
_PVAPI_LIBRARY_HINT
}
"
)
if
(
PVAPI_LIBRARY
)
if
(
WIN32
)
if
(
MINGW
)
set
(
PVAPI_DEFINITIONS
"-DPVDECL=__stdcall"
)
endif
(
MINGW
)
endif
()
set
(
HAVE_PVAPI TRUE
)
endif
()
endif
(
PVAPI_INCLUDE_PATH
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录