Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
01a980aa
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,发现更多精彩内容 >>
提交
01a980aa
编写于
2月 17, 2014
作者:
A
Alexander Karsakov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed compilation with IPP on Linux. Added linking with Intel compiler runtime libraries.
上级
e0d991cf
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
33 addition
and
6 deletion
+33
-6
cmake/OpenCVFindIPP.cmake
cmake/OpenCVFindIPP.cmake
+33
-6
未找到文件。
cmake/OpenCVFindIPP.cmake
浏览文件 @
01a980aa
...
@@ -163,9 +163,16 @@ function(set_ipp_new_libraries _LATEST_VERSION)
...
@@ -163,9 +163,16 @@ function(set_ipp_new_libraries _LATEST_VERSION)
${
IPP_LIB_PREFIX
}${
IPP_PREFIX
}${
IPPCV
}${
IPP_SUFFIX
}${
IPP_LIB_SUFFIX
}
${
IPP_LIB_PREFIX
}${
IPP_PREFIX
}${
IPPCV
}${
IPP_SUFFIX
}${
IPP_LIB_SUFFIX
}
${
IPP_LIB_PREFIX
}${
IPP_PREFIX
}${
IPPI
}${
IPP_SUFFIX
}${
IPP_LIB_SUFFIX
}
${
IPP_LIB_PREFIX
}${
IPP_PREFIX
}${
IPPI
}${
IPP_SUFFIX
}${
IPP_LIB_SUFFIX
}
${
IPP_LIB_PREFIX
}${
IPP_PREFIX
}${
IPPS
}${
IPP_SUFFIX
}${
IPP_LIB_SUFFIX
}
${
IPP_LIB_PREFIX
}${
IPP_PREFIX
}${
IPPS
}${
IPP_SUFFIX
}${
IPP_LIB_SUFFIX
}
${
IPP_LIB_PREFIX
}${
IPP_PREFIX
}${
IPPCORE
}${
IPP_SUFFIX
}${
IPP_LIB_SUFFIX
}
${
IPP_LIB_PREFIX
}${
IPP_PREFIX
}${
IPPCORE
}${
IPP_SUFFIX
}${
IPP_LIB_SUFFIX
}
)
PARENT_SCOPE
)
if
(
UNIX
)
set
(
IPP_LIBRARIES
${
IPP_LIBRARIES
}
${
IPP_LIB_PREFIX
}
irc
${
CMAKE_SHARED_LIBRARY_SUFFIX
}
${
IPP_LIB_PREFIX
}
imf
${
CMAKE_SHARED_LIBRARY_SUFFIX
}
${
IPP_LIB_PREFIX
}
svml
${
CMAKE_SHARED_LIBRARY_SUFFIX
}
)
endif
()
set
(
IPP_LIBRARIES
${
IPP_LIBRARIES
}
PARENT_SCOPE
)
return
()
return
()
endfunction
()
endfunction
()
...
@@ -208,18 +215,38 @@ function(set_ipp_variables _LATEST_VERSION)
...
@@ -208,18 +215,38 @@ function(set_ipp_variables _LATEST_VERSION)
set
(
IPP_INCLUDE_DIRS
${
IPP_ROOT_DIR
}
/include PARENT_SCOPE
)
set
(
IPP_INCLUDE_DIRS
${
IPP_ROOT_DIR
}
/include PARENT_SCOPE
)
if
(
APPLE
)
if
(
APPLE
)
set
(
IPP_LIBRARY_DIRS
${
IPP_ROOT_DIR
}
/lib
PARENT_SCOPE
)
set
(
IPP_LIBRARY_DIRS
${
IPP_ROOT_DIR
}
/lib
)
elseif
(
IPP_X64
)
elseif
(
IPP_X64
)
if
(
NOT EXISTS
${
IPP_ROOT_DIR
}
/lib/intel64
)
if
(
NOT EXISTS
${
IPP_ROOT_DIR
}
/lib/intel64
)
message
(
SEND_ERROR
"IPP EM64T libraries not found"
)
message
(
SEND_ERROR
"IPP EM64T libraries not found"
)
endif
()
endif
()
set
(
IPP_LIBRARY_DIRS
${
IPP_ROOT_DIR
}
/lib/intel64
PARENT_SCOPE
)
set
(
IPP_LIBRARY_DIRS
${
IPP_ROOT_DIR
}
/lib/intel64
)
else
()
else
()
if
(
NOT EXISTS
${
IPP_ROOT_DIR
}
/lib/ia32
)
if
(
NOT EXISTS
${
IPP_ROOT_DIR
}
/lib/ia32
)
message
(
SEND_ERROR
"IPP IA32 libraries not found"
)
message
(
SEND_ERROR
"IPP IA32 libraries not found"
)
endif
()
endif
()
set
(
IPP_LIBRARY_DIRS
${
IPP_ROOT_DIR
}
/lib/ia32 PARENT_SCOPE
)
set
(
IPP_LIBRARY_DIRS
${
IPP_ROOT_DIR
}
/lib/ia32
)
endif
()
if
(
UNIX
)
get_filename_component
(
INTEL_COMPILER_LIBRARY_DIR
${
IPP_ROOT_DIR
}
/../lib REALPATH
)
if
(
IPP_X64
)
if
(
NOT EXISTS
${
INTEL_COMPILER_LIBRARY_DIR
}
/intel64
)
message
(
SEND_ERROR
"Intel compiler EM64T libraries not found"
)
endif
()
set
(
IPP_LIBRARY_DIRS
${
IPP_LIBRARY_DIRS
}
${
INTEL_COMPILER_LIBRARY_DIR
}
/intel64
)
else
()
if
(
NOT EXISTS
${
INTEL_COMPILER_LIBRARY_DIR
}
/ia32
)
message
(
SEND_ERROR
"Intel compiler IA32 libraries not found"
)
endif
()
set
(
IPP_LIBRARY_DIRS
${
IPP_LIBRARY_DIRS
}
${
INTEL_COMPILER_LIBRARY_DIR
}
/ia32
)
endif
()
endif
()
endif
()
set
(
IPP_LIBRARY_DIRS
${
IPP_LIBRARY_DIRS
}
PARENT_SCOPE
)
# set IPP_LIBRARIES variable (7.x or 8.x lib names)
# set IPP_LIBRARIES variable (7.x or 8.x lib names)
set_ipp_new_libraries
(
${
_LATEST_VERSION
}
)
set_ipp_new_libraries
(
${
_LATEST_VERSION
}
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录