Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
0ebe387c
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,发现更多精彩内容 >>
提交
0ebe387c
编写于
6月 22, 2016
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #6713 from alalek:cmake_install_fix
上级
f0dc7a25
f57e3ce5
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
8 addition
and
4 deletion
+8
-4
CMakeLists.txt
CMakeLists.txt
+1
-1
cmake/OpenCVGenConfig.cmake
cmake/OpenCVGenConfig.cmake
+2
-2
cmake/OpenCVUtils.cmake
cmake/OpenCVUtils.cmake
+5
-1
未找到文件。
CMakeLists.txt
浏览文件 @
0ebe387c
...
...
@@ -386,7 +386,7 @@ else()
ocv_update
(
OPENCV_SAMPLES_SRC_INSTALL_PATH samples/native
)
ocv_update
(
OPENCV_JAR_INSTALL_PATH java
)
ocv_update
(
OPENCV_OTHER_INSTALL_PATH etc
)
ocv_update
(
OPENCV_CONFIG_INSTALL_PATH
""
)
ocv_update
(
OPENCV_CONFIG_INSTALL_PATH
"
.
"
)
else
()
ocv_update
(
OPENCV_LIB_INSTALL_PATH lib
${
LIB_SUFFIX
}
)
ocv_update
(
OPENCV_3P_LIB_INSTALL_PATH share/OpenCV/3rdparty/
${
OPENCV_LIB_INSTALL_PATH
}
)
...
...
cmake/OpenCVGenConfig.cmake
浏览文件 @
0ebe387c
...
...
@@ -79,7 +79,7 @@ function(ocv_gen_config TMP_DIR NESTED_PATH ROOT_NAME)
install
(
FILES
"
${
TMP_DIR
}
/OpenCVConfig-version.cmake"
"
${
__tmp_nested
}
/OpenCVConfig.cmake"
DESTINATION
"
${
CMAKE_INSTALL_PREFIX
}
/
${
__install_nested
}
"
COMPONENT dev
)
DESTINATION
"
${
__install_nested
}
"
COMPONENT dev
)
if
(
ROOT_NAME
)
# Root config file
...
...
@@ -87,7 +87,7 @@ function(ocv_gen_config TMP_DIR NESTED_PATH ROOT_NAME)
install
(
FILES
"
${
TMP_DIR
}
/OpenCVConfig-version.cmake"
"
${
TMP_DIR
}
/OpenCVConfig.cmake"
DESTINATION
"
${
CMAKE_INSTALL_PREFIX
}
/
${
OPENCV_CONFIG_INSTALL_PATH
}
"
COMPONENT dev
)
DESTINATION
"
${
OPENCV_CONFIG_INSTALL_PATH
}
"
COMPONENT dev
)
endif
()
endfunction
()
...
...
cmake/OpenCVUtils.cmake
浏览文件 @
0ebe387c
...
...
@@ -87,7 +87,11 @@ endmacro()
macro
(
ocv_path_join result_var P1 P2
)
string
(
REGEX REPLACE
"^[/]+"
""
P2
"
${
P2
}
"
)
if
(
"
${
P1
}
"
STREQUAL
""
)
set
(
${
result_var
}
"
${
P2
}
"
)
if
(
"
${
P2
}
"
STREQUAL
""
)
set
(
${
result_var
}
"."
)
else
()
set
(
${
result_var
}
"
${
P2
}
"
)
endif
()
elseif
(
"
${
P1
}
"
STREQUAL
"/"
)
set
(
${
result_var
}
"/
${
P2
}
"
)
elseif
(
"
${
P2
}
"
STREQUAL
""
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录