Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
3ec6934d
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,发现更多精彩内容 >>
提交
3ec6934d
编写于
12月 04, 2010
作者:
V
Vadim Pisarevsky
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
starting to fix CMake scripts for the proper OpenCVConfig.cmake behavior
上级
a7a5dd05
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
13 addition
and
16 deletion
+13
-16
CMakeLists.txt
CMakeLists.txt
+13
-16
未找到文件。
CMakeLists.txt
浏览文件 @
3ec6934d
...
...
@@ -1067,7 +1067,18 @@ set(CMAKE_BASE_INCLUDE_DIRS_CONFIGCMAKE "\"\"")
set
(
CMAKE_LIB_DIRS_CONFIGCMAKE
"
${
CMAKE_INSTALL_PREFIX
}
/lib"
)
#exec_program(${CMAKE_COMMAND} ARGS "-E make_directory \"${CMAKE_BINARY_DIR}/unix-install/\"")
# This will expand to, for example, <program files>/OpenCV 1.1.0/include
set
(
CMAKE_INCLUDE_DIRS_CONFIGCMAKE
"
\"\$
{THIS_OPENCV_CONFIG_PATH}/include
\"
\"\$
{THIS_OPENCV_CONFIG_PATH}/include/opencv
\"
\"\$
{THIS_OPENCV_CONFIG_PATH}/3rdparty/include
\"
"
)
set
(
CMAKE_BASE_INCLUDE_DIRS_CONFIGCMAKE
"
\"\$
{THIS_OPENCV_CONFIG_PATH}
\"
"
)
# This will expand to, for example, <program files>/OpenCV 1.1.0/lib
# support for 3rdparty libraries.
set
(
CMAKE_LIB_DIRS_CONFIGCMAKE
"
\"\$
{THIS_OPENCV_CONFIG_PATH}/lib
\"
\"\$
{THIS_OPENCV_CONFIG_PATH}/3rdparty/lib
\"
"
)
exec_program
(
mkdir ARGS
"-p
\"
${
CMAKE_BINARY_DIR
}
/unix-install/
\"
"
OUTPUT_VARIABLE RET_VAL
)
configure_file
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/OpenCVConfig.cmake.in"
"
${
CMAKE_BINARY_DIR
}
/unix-install/OpenCVConfig.cmake"
IMMEDIATE @ONLY
)
...
...
@@ -1080,25 +1091,12 @@ endif()
# Part 3/3: ${BIN_DIR}/win-install/OpenCVConfig.cmake -> For use within binary installers/packages
# -------------------------------------------------------------------------------------------
if
(
WIN32
)
# Set CMAKE_INCLUDE_DIRS_CONFIGCMAKE to the list of include directories:
# support for 3rdparty libraries.
# This will expand to, for example, <program files>/OpenCV 1.1.0/include
set
(
CMAKE_INCLUDE_DIRS_CONFIGCMAKE
"
\"\$
{THIS_OPENCV_CONFIG_PATH}/include
\"
\"\$
{THIS_OPENCV_CONFIG_PATH}/include/opencv
\"
\"\$
{THIS_OPENCV_CONFIG_PATH}/3rdparty/include
\"
"
)
set
(
CMAKE_BASE_INCLUDE_DIRS_CONFIGCMAKE
"
\"\$
{THIS_OPENCV_CONFIG_PATH}
\"
"
)
# This will expand to, for example, <program files>/OpenCV 1.1.0/lib
# support for 3rdparty libraries.
set
(
CMAKE_LIB_DIRS_CONFIGCMAKE
"
\"\$
{THIS_OPENCV_CONFIG_PATH}/lib
\"
\"\$
{THIS_OPENCV_CONFIG_PATH}/3rdparty/lib
\"
"
)
#exec_program(${CMAKE_COMMAND} ARGS "-E make_directory \"${CMAKE_BINARY_DIR}/win-install/\"")
exec_program
(
mkdir ARGS
"-p
\"
${
CMAKE_BINARY_DIR
}
/win-install/
\"
"
OUTPUT_VARIABLE RET_VAL
)
#
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/win-install/OpenCVConfig.cmake" IMMEDIATE @ONLY)
configure_file
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/OpenCVConfig.cmake.in"
"
${
CMAKE_BINARY_DIR
}
/win-install/OpenCVConfig.cmake"
IMMEDIATE @ONLY
)
# Install the OpenCVConfig.cmake file which has the right paths pointing to the install directory
install
(
FILES
"
${
CMAKE_BINARY_DIR
}
/win-install/OpenCVConfig.cmake"
DESTINATION
"
${
CMAKE_INSTALL_PREFIX
}
/"
)
...
...
@@ -1114,7 +1112,6 @@ if(WIN32)
# Add the OpenCV configuration header to the install path
# Useful for instance if a client application checks against the features OpenCV has been compiled with
install
(
FILES
"
${
CMAKE_BINARY_DIR
}
/cvconfig.h"
DESTINATION
"
${
CMAKE_INSTALL_PREFIX
}
/include"
)
endif
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录