Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
d32d3157
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,发现更多精彩内容 >>
提交
d32d3157
编写于
11月 10, 2019
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #15835 from alalek:cmake_cpu_optimizations_fix_15802
上级
e9dcecf9
21c38bbd
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
17 addition
and
2 deletion
+17
-2
cmake/OpenCVCompilerOptimizations.cmake
cmake/OpenCVCompilerOptimizations.cmake
+4
-1
cmake/OpenCVModule.cmake
cmake/OpenCVModule.cmake
+0
-1
cmake/OpenCVUtils.cmake
cmake/OpenCVUtils.cmake
+13
-0
未找到文件。
cmake/OpenCVCompilerOptimizations.cmake
浏览文件 @
d32d3157
...
...
@@ -714,7 +714,10 @@ macro(ocv_compiler_optimization_process_sources SOURCES_VAR_NAME LIBS_VAR_NAME T
foreach
(
OPT
${
CPU_DISPATCH_FINAL
}
)
if
(
__result_
${
OPT
}
)
#message("${OPT}: ${__result_${OPT}}")
if
(
CMAKE_GENERATOR MATCHES
"^Visual"
)
if
(
CMAKE_GENERATOR MATCHES
"^Visual"
OR OPENCV_CMAKE_CPU_OPTIMIZATIONS_FORCE_TARGETS
)
# MSVS generator is not able to properly order compilation flags:
# extra flags are added before common flags, so switching between optimizations doesn't work correctly
# Also CMAKE_CXX_FLAGS doesn't work (it is directory-based, so add_subdirectory is required)
add_library
(
${
TARGET_BASE_NAME
}
_
${
OPT
}
OBJECT
${
__result_
${
OPT
}}
)
...
...
cmake/OpenCVModule.cmake
浏览文件 @
d32d3157
...
...
@@ -63,7 +63,6 @@ foreach(mod ${OPENCV_MODULES_BUILD} ${OPENCV_MODULES_DISABLED_USER} ${OPENCV_MOD
unset
(
OPENCV_MODULE_
${
mod
}
_PRIVATE_OPT_DEPS CACHE
)
unset
(
OPENCV_MODULE_
${
mod
}
_LINK_DEPS CACHE
)
unset
(
OPENCV_MODULE_
${
mod
}
_WRAPPERS CACHE
)
unset
(
OPENCV_DEPENDANT_TARGETS_
${
mod
}
CACHE
)
endforeach
()
# clean modules info which needs to be recalculated
...
...
cmake/OpenCVUtils.cmake
浏览文件 @
d32d3157
...
...
@@ -288,9 +288,22 @@ function(ocv_append_target_property target prop)
endif
()
endfunction
()
if
(
DEFINED OPENCV_DEPENDANT_TARGETS_LIST
)
foreach
(
v
${
OPENCV_DEPENDANT_TARGETS_LIST
}
)
unset
(
${
v
}
CACHE
)
endforeach
()
unset
(
OPENCV_DEPENDANT_TARGETS_LIST CACHE
)
endif
()
function
(
ocv_append_dependant_targets target
)
#ocv_debug_message("ocv_append_dependant_targets(${target} ${ARGN})")
_ocv_fix_target
(
target
)
list
(
FIND OPENCV_DEPENDANT_TARGETS_LIST
"OPENCV_DEPENDANT_TARGETS_
${
target
}
"
__id
)
if
(
__id EQUAL -1
)
list
(
APPEND OPENCV_DEPENDANT_TARGETS_LIST
"OPENCV_DEPENDANT_TARGETS_
${
target
}
"
)
list
(
SORT OPENCV_DEPENDANT_TARGETS_LIST
)
set
(
OPENCV_DEPENDANT_TARGETS_LIST
"
${
OPENCV_DEPENDANT_TARGETS_LIST
}
"
CACHE INTERNAL
""
)
endif
()
set
(
OPENCV_DEPENDANT_TARGETS_
${
target
}
"
${
OPENCV_DEPENDANT_TARGETS_
${
target
}}
;
${
ARGN
}
"
CACHE INTERNAL
""
FORCE
)
endfunction
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录