Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
40eb613b
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,发现更多精彩内容 >>
提交
40eb613b
编写于
3月 13, 2016
作者:
X
Xiaolei Yu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make install paths relative to CMAKE_INSTALL_PREFIX
上级
fbc221d3
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
11 addition
and
8 deletion
+11
-8
CMakeLists.txt
CMakeLists.txt
+3
-3
cmake/OpenCVGenConfig.cmake
cmake/OpenCVGenConfig.cmake
+3
-3
modules/java/CMakeLists.txt
modules/java/CMakeLists.txt
+5
-2
未找到文件。
CMakeLists.txt
浏览文件 @
40eb613b
...
...
@@ -711,7 +711,7 @@ if(INSTALL_TESTS AND OPENCV_TEST_DATA_PATH)
configure_file
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake/templates/opencv_run_all_tests_android.sh.in"
"
${
CMAKE_BINARY_DIR
}
/unix-install/opencv_run_all_tests.sh"
@ONLY
)
install
(
PROGRAMS
"
${
CMAKE_BINARY_DIR
}
/unix-install/opencv_run_all_tests.sh"
DESTINATION
${
CMAKE_INSTALL_PREFIX
}
COMPONENT tests
)
DESTINATION
./
COMPONENT tests
)
elseif
(
WIN32
)
configure_file
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake/templates/opencv_run_all_tests_windows.cmd.in"
"
${
CMAKE_BINARY_DIR
}
/win-install/opencv_run_all_tests.cmd"
@ONLY
)
...
...
@@ -739,11 +739,11 @@ endif()
if
(
ANDROID OR NOT UNIX
)
install
(
FILES
${
OPENCV_LICENSE_FILE
}
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
DESTINATION
${
CMAKE_INSTALL_PREFIX
}
COMPONENT libs
)
DESTINATION
./
COMPONENT libs
)
if
(
OPENCV_README_FILE
)
install
(
FILES
${
OPENCV_README_FILE
}
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
DESTINATION
${
CMAKE_INSTALL_PREFIX
}
COMPONENT libs
)
DESTINATION
./
COMPONENT libs
)
endif
()
endif
()
...
...
cmake/OpenCVGenConfig.cmake
浏览文件 @
40eb613b
...
...
@@ -145,11 +145,11 @@ if(WIN32)
install
(
FILES
"
${
CMAKE_BINARY_DIR
}
/win-install/OpenCVConfig.cmake"
DESTINATION
"
${
OpenCV_INSTALL_BINARIES_PREFIX
}
staticlib"
COMPONENT dev
)
install
(
EXPORT OpenCVModules DESTINATION
"
${
OpenCV_INSTALL_BINARIES_PREFIX
}
staticlib"
FILE OpenCVModules
${
modules_file_suffix
}
.cmake COMPONENT dev
)
endif
()
install
(
FILES
"
${
CMAKE_BINARY_DIR
}
/win-install/OpenCVConfig-version.cmake"
DESTINATION
"
${
CMAKE_INSTALL_PREFIX
}
"
COMPONENT dev
)
install
(
FILES
"
${
OpenCV_SOURCE_DIR
}
/cmake/OpenCVConfig.cmake"
DESTINATION
"
${
CMAKE_INSTALL_PREFIX
}
/"
COMPONENT dev
)
install
(
FILES
"
${
CMAKE_BINARY_DIR
}
/win-install/OpenCVConfig-version.cmake"
DESTINATION
./
COMPONENT dev
)
install
(
FILES
"
${
OpenCV_SOURCE_DIR
}
/cmake/OpenCVConfig.cmake"
DESTINATION
./
COMPONENT dev
)
else
()
install
(
FILES
"
${
CMAKE_BINARY_DIR
}
/win-install/OpenCVConfig.cmake"
DESTINATION
"
${
OpenCV_INSTALL_BINARIES_PREFIX
}
lib/cmake/opencv-
${
OPENCV_VERSION
}
"
COMPONENT dev
)
install
(
EXPORT OpenCVModules DESTINATION
"
${
OpenCV_INSTALL_BINARIES_PREFIX
}
lib/cmake/opencv-
${
OPENCV_VERSION
}
"
FILE OpenCVModules
${
modules_file_suffix
}
.cmake COMPONENT dev
)
install
(
FILES
"
${
CMAKE_BINARY_DIR
}
/win-install/OpenCVConfig-version.cmake"
DESTINATION
"
${
CMAKE_INSTALL_PREFIX
}
/
lib/cmake/opencv-
${
OPENCV_VERSION
}
"
COMPONENT dev
)
install
(
FILES
"
${
CMAKE_BINARY_DIR
}
/win-install/OpenCVConfig-version.cmake"
DESTINATION
"lib/cmake/opencv-
${
OPENCV_VERSION
}
"
COMPONENT dev
)
endif
()
endif
()
modules/java/CMakeLists.txt
浏览文件 @
40eb613b
...
...
@@ -287,9 +287,12 @@ if(ANDROID AND ANDROID_EXECUTABLE)
install
(
FILES
"
${
OpenCV_BINARY_DIR
}
/
${
ANDROID_PROJECT_PROPERTIES_FILE
}
"
DESTINATION
${
JAVA_INSTALL_ROOT
}
COMPONENT java
)
install
(
FILES
"
${
OpenCV_BINARY_DIR
}
/
${
ANDROID_MANIFEST_FILE
}
"
DESTINATION
${
JAVA_INSTALL_ROOT
}
COMPONENT java
)
# creating empty 'gen' and 'res' folders
install
(
CODE
"MAKE_DIRECTORY(
\"\$
ENV{DESTDIR}
\$
{CMAKE_INSTALL_PREFIX}/
${
JAVA_INSTALL_ROOT
}
/gen
\"
)"
COMPONENT java
)
install
(
CODE
"MAKE_DIRECTORY(
\"\$
ENV{DESTDIR}
\$
{CMAKE_INSTALL_PREFIX}/
${
JAVA_INSTALL_ROOT
}
/res
\"
)"
COMPONENT java
)
file
(
MAKE_DIRECTORY
${
OpenCV_BINARY_DIR
}
/sdk/java/gen
${
OpenCV_BINARY_DIR
}
/sdk/java/res
)
install
(
DIRECTORY
${
OpenCV_BINARY_DIR
}
/sdk/java/gen DESTINATION
${
JAVA_INSTALL_ROOT
}
/ COMPONENT java
)
install
(
DIRECTORY
${
OpenCV_BINARY_DIR
}
/sdk/java/res DESTINATION
${
JAVA_INSTALL_ROOT
}
/ COMPONENT java
)
endif
(
ANDROID AND ANDROID_EXECUTABLE
)
set
(
step3_depends
${
step2_depends
}
${
step3_input_files
}
${
copied_files
}
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录