Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
b8457be3
O
Opencv
项目概览
Greenplum
/
Opencv
10 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
b8457be3
编写于
10月 02, 2014
作者:
M
Maksim Shabunin
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #3216 from xantares:patch-1
上级
7e8846b8
9d13c7b1
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
17 addition
and
11 deletion
+17
-11
CMakeLists.txt
CMakeLists.txt
+2
-2
cmake/OpenCVGenConfig.cmake
cmake/OpenCVGenConfig.cmake
+15
-9
未找到文件。
CMakeLists.txt
浏览文件 @
b8457be3
...
...
@@ -254,7 +254,7 @@ else()
set
(
OPENCV_DOC_INSTALL_PATH share/OpenCV/doc
)
endif
()
if
(
WIN32
)
if
(
WIN32
AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows
)
if
(
DEFINED OpenCV_RUNTIME AND DEFINED OpenCV_ARCH
)
set
(
OpenCV_INSTALL_BINARIES_PREFIX
"
${
OpenCV_ARCH
}
/
${
OpenCV_RUNTIME
}
/"
)
else
()
...
...
@@ -294,7 +294,7 @@ if(ANDROID)
else
()
set
(
LIBRARY_OUTPUT_PATH
"
${
OpenCV_BINARY_DIR
}
/lib"
)
set
(
3P_LIBRARY_OUTPUT_PATH
"
${
OpenCV_BINARY_DIR
}
/3rdparty/lib
${
LIB_SUFFIX
}
"
)
if
(
WIN32
)
if
(
WIN32
AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows
)
if
(
OpenCV_STATIC
)
set
(
OPENCV_LIB_INSTALL_PATH
"
${
OpenCV_INSTALL_BINARIES_PREFIX
}
staticlib
${
LIB_SUFFIX
}
"
)
else
()
...
...
cmake/OpenCVGenConfig.cmake
浏览文件 @
b8457be3
...
...
@@ -154,13 +154,19 @@ if(WIN32)
endif
()
configure_file
(
"
${
OpenCV_SOURCE_DIR
}
/cmake/templates/OpenCVConfig.cmake.in"
"
${
CMAKE_BINARY_DIR
}
/win-install/OpenCVConfig.cmake"
@ONLY
)
configure_file
(
"
${
OpenCV_SOURCE_DIR
}
/cmake/templates/OpenCVConfig-version.cmake.in"
"
${
CMAKE_BINARY_DIR
}
/win-install/OpenCVConfig-version.cmake"
@ONLY
)
if
(
BUILD_SHARED_LIBS
)
install
(
FILES
"
${
CMAKE_BINARY_DIR
}
/win-install/OpenCVConfig.cmake"
DESTINATION
"
${
OpenCV_INSTALL_BINARIES_PREFIX
}
lib"
COMPONENT dev
)
install
(
EXPORT OpenCVModules DESTINATION
"
${
OpenCV_INSTALL_BINARIES_PREFIX
}
lib"
FILE OpenCVModules
${
modules_file_suffix
}
.cmake COMPONENT dev
)
else
()
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
)
if
(
CMAKE_HOST_SYSTEM_NAME MATCHES Windows
)
if
(
BUILD_SHARED_LIBS
)
install
(
FILES
"
${
CMAKE_BINARY_DIR
}
/win-install/OpenCVConfig.cmake"
DESTINATION
"
${
OpenCV_INSTALL_BINARIES_PREFIX
}
lib"
COMPONENT dev
)
install
(
EXPORT OpenCVModules DESTINATION
"
${
OpenCV_INSTALL_BINARIES_PREFIX
}
lib"
FILE OpenCVModules
${
modules_file_suffix
}
.cmake COMPONENT dev
)
else
()
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
)
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
)
endif
()
endif
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录