Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
3d665911
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,发现更多精彩内容 >>
提交
3d665911
编写于
2月 02, 2018
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
cmake: fix includes processing
上级
403c3c3d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
17 addition
and
22 deletion
+17
-22
cmake/OpenCVModule.cmake
cmake/OpenCVModule.cmake
+11
-16
modules/cudev/CMakeLists.txt
modules/cudev/CMakeLists.txt
+1
-1
modules/dnn/CMakeLists.txt
modules/dnn/CMakeLists.txt
+5
-5
未找到文件。
cmake/OpenCVModule.cmake
浏览文件 @
3d665911
...
...
@@ -164,7 +164,7 @@ macro(ocv_add_module _name)
set
(
OPENCV_MODULE_
${
the_module
}
_LINK_DEPS
""
CACHE INTERNAL
""
)
# parse list of dependencies
if
(
"
${
ARGV1
}
"
STREQUAL
"INTERNAL"
OR
"
${
ARGV1
}
"
STREQUAL
"
BINDINGS"
)
if
(
"
${
ARGV1
}
"
STREQUAL
" INTERNAL"
OR
"
${
ARGV1
}
"
STREQUAL
"
BINDINGS"
)
set
(
OPENCV_MODULE_
${
the_module
}
_CLASS
"
${
ARGV1
}
"
CACHE INTERNAL
"The category of the module"
)
set
(
__ocv_argn__
${
ARGN
}
)
list
(
REMOVE_AT __ocv_argn__ 0
)
...
...
@@ -257,7 +257,7 @@ endmacro()
# Usage: _glob_locations(<output paths list> <output names list> <folder> [<folder> ...])
function
(
_glob_locations out_paths out_names
)
foreach
(
path
${
ARGN
}
)
message
(
STATUS
"Inspect:
${
path
}
"
)
#
message(STATUS "Inspect: ${path}")
list
(
LENGTH paths before
)
get_filename_component
(
path
"
${
path
}
"
ABSOLUTE
)
# Either module itself
...
...
@@ -269,7 +269,7 @@ function(_glob_locations out_paths out_names)
# Either flat collection of modules
file
(
GLOB subdirs RELATIVE
"
${
path
}
"
"
${
path
}
/*"
)
foreach
(
subdir
${
subdirs
}
)
message
(
STATUS
"Inspect:
${
path
}
/
${
subdir
}
"
)
#
message(STATUS "Inspect: ${path}/${subdir}")
if
(
EXISTS
"
${
path
}
/
${
subdir
}
/CMakeLists.txt"
)
list
(
APPEND paths
"
${
path
}
/
${
subdir
}
"
)
list
(
APPEND names
"
${
subdir
}
"
)
...
...
@@ -302,7 +302,7 @@ function(_add_modules_1 paths names)
foreach
(
i RANGE
${
len
}
)
list
(
GET
${
paths
}
${
i
}
path
)
list
(
GET
${
names
}
${
i
}
name
)
message
(
STATUS
"First pass:
${
name
}
=>
${
path
}
"
)
#
message(STATUS "First pass: ${name} => ${path}")
include
(
"
${
path
}
/cmake/init.cmake"
OPTIONAL
)
add_subdirectory
(
"
${
path
}
"
"
${
CMAKE_CURRENT_BINARY_DIR
}
/.firstpass/
${
name
}
"
)
endforeach
()
...
...
@@ -320,7 +320,7 @@ function(_add_modules_2)
message
(
WARNING
"Incorrect module name:
${
m
}
"
)
endif
()
string
(
REGEX REPLACE
"^opencv_"
""
name
"
${
m
}
"
)
message
(
STATUS
"Second pass:
${
name
}
=>
${
OPENCV_MODULE_
${
m
}
_LOCATION
}
"
)
#
message(STATUS "Second pass: ${name} => ${OPENCV_MODULE_${m}_LOCATION}")
add_subdirectory
(
"
${
OPENCV_MODULE_
${
m
}
_LOCATION
}
"
"
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
name
}
"
)
endif
()
endforeach
()
...
...
@@ -427,7 +427,7 @@ function(__ocv_sort_modules_by_deps __lst)
break
()
endif
()
else
()
message
(
FATAL_ERROR
WARNING
"
Unresolved dependencies or loop in dependency graph (
${
length_after
}
)
\n
"
message
(
FATAL_ERROR
"FATAL:
Unresolved dependencies or loop in dependency graph (
${
length_after
}
)
\n
"
"Processed
${
__lst
}
:
${${
__lst
}}
\n
"
"Good modules:
${
result
}
\n
"
"Bad modules:
${
input
}
"
...
...
@@ -652,12 +652,14 @@ endmacro()
# setup include paths for the list of passed modules
macro
(
ocv_target_include_modules target
)
foreach
(
d
${
ARGN
}
)
if
(
d MATCHES
"^opencv_"
AND HAVE_
${
d
}
)
if
(
EXISTS
"
${
OPENCV_MODULE_
${
d
}
_LOCATION
}
/include"
)
if
(
d MATCHES
"^opencv_"
)
if
(
HAVE_
${
d
}
AND
EXISTS
"
${
OPENCV_MODULE_
${
d
}
_LOCATION
}
/include"
)
ocv_target_include_directories
(
${
target
}
"
${
OPENCV_MODULE_
${
d
}
_LOCATION
}
/include"
)
endif
()
elseif
(
EXISTS
"
${
d
}
"
)
ocv_target_include_directories
(
${
target
}
"
${
d
}
"
)
else
()
message
(
WARNING
"Unexpected include:
${
d
}
(module=
${
the_module
}
)"
)
endif
()
endforeach
()
endmacro
()
...
...
@@ -686,14 +688,7 @@ macro(ocv_module_include_directories)
"
${
OPENCV_MODULE_
${
the_module
}
_LOCATION
}
/src"
"
${
CMAKE_CURRENT_BINARY_DIR
}
"
# for precompiled headers
)
foreach
(
arg
${
ARGN
}
)
if
(
IS_ABSOLUTE
"
${
arg
}
"
)
list
(
APPEND incs
"
${
arg
}
"
)
else
()
list
(
APPEND incs
"
${
OPENCV_MODULE_
${
the_module
}
_LOCATION
}
/
${
arg
}
"
)
endif
()
endforeach
()
ocv_target_include_modules
(
${
the_module
}
${
OPENCV_MODULE_
${
the_module
}
_DEPS
}
${
incs
}
)
ocv_target_include_modules
(
${
the_module
}
${
OPENCV_MODULE_
${
the_module
}
_DEPS
}
${
ARGN
}
)
endmacro
()
...
...
modules/cudev/CMakeLists.txt
浏览文件 @
3d665911
...
...
@@ -8,7 +8,7 @@ ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4189 /wd4505 -Wundef -Wmissing-declarati
ocv_add_module
(
cudev
)
ocv_module_include_directories
(
opencv_core
opencv_hal
)
ocv_module_include_directories
(
opencv_core
)
file
(
GLOB_RECURSE lib_hdrs
"
${
CMAKE_CURRENT_LIST_DIR
}
/include/opencv2/
${
name
}
/*.hpp"
)
file
(
GLOB lib_srcs
"
${
CMAKE_CURRENT_LIST_DIR
}
/src/*.cpp"
)
...
...
modules/dnn/CMakeLists.txt
浏览文件 @
3d665911
...
...
@@ -53,16 +53,16 @@ ocv_warnings_disable(CMAKE_CXX_FLAGS
)
if
(
PROTOBUF_UPDATE_FILES
)
file
(
GLOB proto_files
"
${
CMAKE_CURRENT_
SOURCE_DIR
}
/src/tensorflow/*.proto"
"
${
CMAKE_CURRENT_SOURCE
_DIR
}
/src/caffe/opencv-caffe.proto"
)
file
(
GLOB proto_files
"
${
CMAKE_CURRENT_
LIST_DIR
}
/src/tensorflow/*.proto"
"
${
CMAKE_CURRENT_LIST
_DIR
}
/src/caffe/opencv-caffe.proto"
)
set
(
PROTOBUF_GENERATE_CPP_APPEND_PATH ON
)
# required for tensorflow
protobuf_generate_cpp
(
fw_srcs fw_hdrs
${
proto_files
}
)
else
()
file
(
GLOB fw_srcs
"
${
CMAKE_CURRENT_
SOURCE_DIR
}
/misc/tensorflow/*.cc"
"
${
CMAKE_CURRENT_SOURCE
_DIR
}
/misc/caffe/opencv-caffe.pb.cc"
)
file
(
GLOB fw_hdrs
"
${
CMAKE_CURRENT_
SOURCE_DIR
}
/misc/tensorflow/*.h"
"
${
CMAKE_CURRENT_SOURCE
_DIR
}
/misc/caffe/opencv-caffe.pb.h"
)
set
(
fw_inc
"
misc/caffe"
"
misc/tensorflow"
)
file
(
GLOB fw_srcs
"
${
CMAKE_CURRENT_
LIST_DIR
}
/misc/tensorflow/*.cc"
"
${
CMAKE_CURRENT_LIST
_DIR
}
/misc/caffe/opencv-caffe.pb.cc"
)
file
(
GLOB fw_hdrs
"
${
CMAKE_CURRENT_
LIST_DIR
}
/misc/tensorflow/*.h"
"
${
CMAKE_CURRENT_LIST
_DIR
}
/misc/caffe/opencv-caffe.pb.h"
)
set
(
fw_inc
"
${
CMAKE_CURRENT_LIST_DIR
}
/misc/caffe"
"
${
CMAKE_CURRENT_LIST_DIR
}
/
misc/tensorflow"
)
endif
()
ocv_module_include_directories
(
${
fw_inc
}
src/ocl4dnn/include
${
OPENCL_INCLUDE_DIRS
}
)
ocv_module_include_directories
(
${
fw_inc
}
${
CMAKE_CURRENT_LIST_DIR
}
/
src/ocl4dnn/include
${
OPENCL_INCLUDE_DIRS
}
)
ocv_glob_module_sources
(
SOURCES
${
fw_srcs
}
)
ocv_create_module
(
libprotobuf
${
LAPACK_LIBRARIES
}
)
ocv_add_samples
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录