Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
773654e1
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,发现更多精彩内容 >>
提交
773654e1
编写于
6月 28, 2011
作者:
E
Ethan Rublee
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
More work on the mangling of install paths.
上级
4f89292a
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
21 addition
and
4 deletion
+21
-4
CMakeLists.txt
CMakeLists.txt
+21
-4
未找到文件。
CMakeLists.txt
浏览文件 @
773654e1
...
...
@@ -128,6 +128,7 @@ if(UNIX)
option
(
OPENCV_MANGLED_INSTALL_PATHS
"Enables mangled install paths, that help with side by side installs"
False
)
if
(
OPENCV_MANGLED_INSTALL_PATHS
)
set
(
OPENCV_INCLUDE_PREFIX include/opencv-
${
OPENCV_VERSION
}
)
set
(
OPENCV_DOC_INSTALL_PATH share/OpenCV-
${
OPENCV_VERSION
}
/doc
)
endif
()
endif
()
...
...
@@ -1153,7 +1154,8 @@ set(CMAKE_LIB_DIRS_CONFIGCMAKE "${LIBRARY_OUTPUT_PATH}")
set
(
CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE
"
\"
${
CMAKE_BINARY_DIR
}
/3rdparty/
${
OPENCV_LIB_INSTALL_PATH
}
\"
"
)
configure_file
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/OpenCVConfig.cmake.in"
"
${
CMAKE_BINARY_DIR
}
/OpenCVConfig.cmake"
IMMEDIATE @ONLY
)
#support for version checking when finding opencv. find_package(OpenCV 2.3.1 EXACT) should now work.
configure_file
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/OpenCVConfig-version.cmake.in"
"
${
CMAKE_BINARY_DIR
}
/OpenCVConfig-version.cmake"
IMMEDIATE @ONLY
)
# --------------------------------------------------------------------------------------------
# Part 2/3: ${BIN_DIR}/unix-install/OpenCVConfig.cmake -> For use *with* "make install"
# -------------------------------------------------------------------------------------------
...
...
@@ -1167,6 +1169,9 @@ if(ANDROID)
else
()
set
(
CMAKE_LIB_DIRS_CONFIGCMAKE
"
\"\$
{OpenCV_INSTALL_PATH}/
${
OPENCV_LIB_INSTALL_PATH
}
\"
"
)
set
(
CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE
"
\"\$
{OpenCV_INSTALL_PATH}/share/OpenCV/3rdparty/
${
OPENCV_LIB_INSTALL_PATH
}
\"
"
)
if
(
OPENCV_MANGLED_INSTALL_PATHS
)
set
(
CMAKE_3RDPARTY_LIB_DIRS_CONFIGCMAKE
"
\"\$
{OpenCV_INSTALL_PATH}/share/OpenCV-
${
OPENCV_VERSION
}
/3rdparty/
${
OPENCV_LIB_INSTALL_PATH
}
\"
"
)
endif
()
endif
()
configure_file
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/OpenCVConfig.cmake.in"
"
${
CMAKE_BINARY_DIR
}
/unix-install/OpenCVConfig.cmake"
IMMEDIATE @ONLY
)
...
...
@@ -1184,9 +1189,9 @@ if(UNIX)
install
(
FILES
${
CMAKE_BINARY_DIR
}
/unix-install/OpenCVConfig-version.cmake DESTINATION share/OpenCV-
${
OPENCV_VERSION
}
/
)
else
()
install
(
FILES
"
${
CMAKE_BINARY_DIR
}
/unix-install/OpenCVConfig.cmake"
DESTINATION share/OpenCV/
)
install
(
FILES
${
CMAKE_BINARY_DIR
}
/unix-install/OpenCVConfig-version.cmake DESTINATION share/OpenCV/
)
endif
()
endif
()
if
(
ANDROID
)
...
...
@@ -1257,6 +1262,12 @@ if(ANDROID)
endif
(
ANDROID
)
# --------------------------------------------------------------------------------------------
#according to man pkg-config
# The package name specified on the pkg-config command line is defined to
# be the name of the metadata file, minus the .pc extension. If a library
# can install multiple versions simultaneously, it must give each version
# its own name (for example, GTK 1.2 might have the package name "gtk+"
# while GTK 2.0 has "gtk+-2.0").
# Part 2/2: ${BIN_DIR}/unix-install/opencv.pc -> For use *with* "make install"
# prefix=/usr
# exec_prefix=${prefix}
...
...
@@ -1269,10 +1280,16 @@ set(libdir "\${exec_prefix}/lib")
set
(
includedir
"
\$
{prefix}/
${
OPENCV_INCLUDE_PREFIX
}
"
)
set
(
VERSION
${
OPENCV_VERSION
}
)
configure_file
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/opencv.pc.cmake.in"
"
${
CMAKE_BINARY_DIR
}
/unix-install/opencv.pc"
@ONLY IMMEDIATE
)
set
(
OPENCV_PC_FILE_NAME
"opencv.pc"
)
#need to be explicit with naming the pc file and version number for side by side installs to work.
if
(
OPENCV_MANGLED_INSTALL_PATHS
)
set
(
OPENCV_PC_FILE_NAME
"opencv-
${
OPENCV_VERSION
}
.pc"
)
endif
()
configure_file
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/opencv.pc.cmake.in"
"
${
CMAKE_BINARY_DIR
}
/unix-install/
${
OPENCV_PC_FILE_NAME
}
"
@ONLY IMMEDIATE
)
if
(
UNIX AND NOT ANDROID
)
install
(
FILES
${
CMAKE_BINARY_DIR
}
/unix-install/opencv.pc
DESTINATION
${
OPENCV_LIB_INSTALL_PATH
}
/pkgconfig
)
install
(
FILES
${
CMAKE_BINARY_DIR
}
/unix-install/
${
OPENCV_PC_FILE_NAME
}
DESTINATION
${
OPENCV_LIB_INSTALL_PATH
}
/pkgconfig
)
endif
()
# ----------------------------------------------------------------------------
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录