Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
86ddff0b
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,发现更多精彩内容 >>
提交
86ddff0b
编写于
9月 19, 2018
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #12401 from alalek:opencv_install_paths
上级
908978d0
a9567328
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
26 addition
and
28 deletion
+26
-28
CMakeLists.txt
CMakeLists.txt
+19
-24
cmake/OpenCVGenPkgconfig.cmake
cmake/OpenCVGenPkgconfig.cmake
+2
-2
cmake/OpenCVUtils.cmake
cmake/OpenCVUtils.cmake
+1
-1
platforms/ios/build_framework.py
platforms/ios/build_framework.py
+3
-1
samples/cpp/example_cmake/CMakeLists.txt
samples/cpp/example_cmake/CMakeLists.txt
+1
-0
未找到文件。
CMakeLists.txt
浏览文件 @
86ddff0b
...
...
@@ -373,8 +373,6 @@ endif()
if
(
ANDROID OR WIN32
)
ocv_update
(
OPENCV_DOC_INSTALL_PATH doc
)
else
()
ocv_update
(
OPENCV_DOC_INSTALL_PATH share/OpenCV/doc
)
endif
()
if
(
WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows
)
...
...
@@ -414,8 +412,6 @@ if(ANDROID)
ocv_update
(
OPENCV_TEST_DATA_INSTALL_PATH
"sdk/etc/testdata"
)
elseif
(
WIN32
)
ocv_update
(
OPENCV_TEST_DATA_INSTALL_PATH
"testdata"
)
else
()
ocv_update
(
OPENCV_TEST_DATA_INSTALL_PATH
"share/OpenCV/testdata"
)
endif
()
if
(
ANDROID
)
...
...
@@ -428,6 +424,7 @@ if(ANDROID)
ocv_update
(
OPENCV_INCLUDE_INSTALL_PATH sdk/native/jni/include
)
ocv_update
(
OPENCV_SAMPLES_SRC_INSTALL_PATH samples/native
)
ocv_update
(
OPENCV_OTHER_INSTALL_PATH sdk/etc
)
ocv_update
(
OPENCV_LICENSES_INSTALL_PATH
"
${
OPENCV_OTHER_INSTALL_PATH
}
/licenses"
)
else
()
set
(
LIBRARY_OUTPUT_PATH
"
${
OpenCV_BINARY_DIR
}
/lib"
)
ocv_update
(
3P_LIBRARY_OUTPUT_PATH
"
${
OpenCV_BINARY_DIR
}
/3rdparty/lib
${
LIB_SUFFIX
}
"
)
...
...
@@ -443,42 +440,40 @@ else()
ocv_update
(
OPENCV_JAR_INSTALL_PATH java
)
ocv_update
(
OPENCV_OTHER_INSTALL_PATH etc
)
ocv_update
(
OPENCV_CONFIG_INSTALL_PATH
"."
)
ocv_update
(
OPENCV_INCLUDE_INSTALL_PATH
"include"
)
ocv_update
(
OPENCV_LICENSES_INSTALL_PATH
"
${
OPENCV_OTHER_INSTALL_PATH
}
/licenses"
)
else
()
# Note: layout differs from OpenCV 3.4
include
(
GNUInstallDirs
)
ocv_update
(
OPENCV_LIB_INSTALL_PATH
${
CMAKE_INSTALL_LIBDIR
}${
LIB_SUFFIX
}
)
ocv_update
(
OPENCV_3P_LIB_INSTALL_PATH share/OpenCV/3rdparty/
${
OPENCV_LIB_INSTALL_PATH
}
)
ocv_update
(
OPENCV_SAMPLES_SRC_INSTALL_PATH share/OpenCV/samples
)
ocv_update
(
OPENCV_JAR_INSTALL_PATH share/OpenCV/java
)
ocv_update
(
OPENCV_OTHER_INSTALL_PATH share/OpenCV
)
if
(
NOT DEFINED OPENCV_CONFIG_INSTALL_PATH
)
math
(
EXPR SIZEOF_VOID_P_BITS
"8 *
${
CMAKE_SIZEOF_VOID_P
}
"
)
if
(
LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX
)
ocv_update
(
OPENCV_CONFIG_INSTALL_PATH
${
CMAKE_INSTALL_LIBDIR
}${
LIB_SUFFIX
}
/cmake/opencv
)
else
()
ocv_update
(
OPENCV_CONFIG_INSTALL_PATH share/OpenCV
)
endif
()
endif
()
ocv_update
(
OPENCV_INCLUDE_INSTALL_PATH
"
${
CMAKE_INSTALL_INCLUDEDIR
}
/opencv4"
)
ocv_update
(
OPENCV_LIB_INSTALL_PATH
"
${
CMAKE_INSTALL_LIBDIR
}${
LIB_SUFFIX
}
"
)
ocv_update
(
OPENCV_CONFIG_INSTALL_PATH
"
${
OPENCV_LIB_INSTALL_PATH
}
/cmake/opencv4"
)
ocv_update
(
OPENCV_3P_LIB_INSTALL_PATH
"
${
OPENCV_LIB_INSTALL_PATH
}
/opencv4/3rdparty"
)
ocv_update
(
OPENCV_SAMPLES_SRC_INSTALL_PATH
"
${
CMAKE_INSTALL_DATAROOTDIR
}
/opencv4/samples"
)
ocv_update
(
OPENCV_DOC_INSTALL_PATH
"
${
CMAKE_INSTALL_DATAROOTDIR
}
/doc/opencv4"
)
ocv_update
(
OPENCV_JAR_INSTALL_PATH
"
${
CMAKE_INSTALL_DATAROOTDIR
}
/java/opencv4"
)
ocv_update
(
OPENCV_TEST_DATA_INSTALL_PATH
"
${
CMAKE_INSTALL_DATAROOTDIR
}
/opencv4/testdata"
)
ocv_update
(
OPENCV_OTHER_INSTALL_PATH
"
${
CMAKE_INSTALL_DATAROOTDIR
}
/opencv4"
)
ocv_update
(
OPENCV_LICENSES_INSTALL_PATH
"
${
CMAKE_INSTALL_DATAROOTDIR
}
/licenses/opencv4"
)
endif
()
ocv_update
(
OPENCV_INCLUDE_INSTALL_PATH
"include"
)
endif
()
ocv_update
(
CMAKE_INSTALL_RPATH
"
${
CMAKE_INSTALL_PREFIX
}
/
${
OPENCV_LIB_INSTALL_PATH
}
"
)
set
(
CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE
)
if
(
INSTALL_TO_MANGLED_PATHS
)
set
(
OPENCV_INCLUDE_INSTALL_PATH
${
OPENCV_INCLUDE_INSTALL_PATH
}
/opencv-
${
OPENCV_VERSION
}
)
foreach
(
v
OPENCV_INCLUDE_INSTALL_PATH
# file names include version (.so/.dll): OPENCV_LIB_INSTALL_PATH
OPENCV_CONFIG_INSTALL_PATH
OPENCV_3P_LIB_INSTALL_PATH
OPENCV_SAMPLES_SRC_INSTALL_PATH
OPENCV_CONFIG_INSTALL_PATH
OPENCV_DOC_INSTALL_PATH
OPENCV_JAR_INSTALL_PATH
# JAR file name includes version:
OPENCV_JAR_INSTALL_PATH
OPENCV_TEST_DATA_INSTALL_PATH
OPENCV_OTHER_INSTALL_PATH
)
string
(
REPLACE
"OpenCV"
"OpenCV-
${
OPENCV_VERSION
}
"
${
v
}
"
${${
v
}}
"
)
string
(
REPLACE
"opencv"
"opencv-
${
OPENCV_VERSION
}
"
${
v
}
"
${${
v
}}
"
)
string
(
REGEX REPLACE
"opencv[0-9]*"
"opencv-
${
OPENCV_VERSION
}
"
${
v
}
"
${${
v
}}
"
)
endforeach
()
endif
()
...
...
cmake/OpenCVGenPkgconfig.cmake
浏览文件 @
86ddff0b
...
...
@@ -43,9 +43,9 @@ endmacro()
if
(
NOT DEFINED CMAKE_HELPER_SCRIPT
)
if
(
INSTALL_TO_MANGLED_PATHS
)
set
(
OPENCV_PC_FILE_NAME
"opencv-
${
OPENCV_VERSION
}
.pc"
)
ocv_update
(
OPENCV_PC_FILE_NAME
"opencv-
${
OPENCV_VERSION
}
.pc"
)
else
()
set
(
OPENCV_PC_FILE_NAME opencv
.pc
)
ocv_update
(
OPENCV_PC_FILE_NAME opencv4
.pc
)
endif
()
# build the list of opencv libs and dependencies for all modules
...
...
cmake/OpenCVUtils.cmake
浏览文件 @
86ddff0b
...
...
@@ -1089,7 +1089,7 @@ function(ocv_install_3rdparty_licenses library)
get_filename_component
(
name
"
${
filename
}
"
NAME
)
install
(
FILES
"
${
filename
}
"
DESTINATION
"
${
OPENCV_
OTHER_INSTALL_PATH
}
/licenses
"
DESTINATION
"
${
OPENCV_
LICENSES_INSTALL_PATH
}
"
COMPONENT licenses
RENAME
"
${
library
}
-
${
name
}
"
OPTIONAL
)
...
...
platforms/ios/build_framework.py
浏览文件 @
86ddff0b
...
...
@@ -128,6 +128,8 @@ class Builder:
"-DAPPLE_FRAMEWORK=ON"
,
"-DCMAKE_INSTALL_PREFIX=install"
,
"-DCMAKE_BUILD_TYPE=Release"
,
"-DOPENCV_INCLUDE_INSTALL_PATH=include"
,
"-DOPENCV_3P_LIB_INSTALL_PATH=lib/3rdparty"
]
+
([
"-DBUILD_SHARED_LIBS=ON"
,
"-DCMAKE_MACOSX_BUNDLE=ON"
,
...
...
@@ -199,7 +201,7 @@ class Builder:
def
mergeLibs
(
self
,
builddir
):
res
=
os
.
path
.
join
(
builddir
,
"lib"
,
"Release"
,
"libopencv_merged.a"
)
libs
=
glob
.
glob
(
os
.
path
.
join
(
builddir
,
"install"
,
"lib"
,
"*.a"
))
libs3
=
glob
.
glob
(
os
.
path
.
join
(
builddir
,
"install"
,
"
share"
,
"OpenCV"
,
"3rdparty"
,
"lib
"
,
"*.a"
))
libs3
=
glob
.
glob
(
os
.
path
.
join
(
builddir
,
"install"
,
"
lib"
,
"3rdparty
"
,
"*.a"
))
print
(
"Merging libraries:
\n\t
%s"
%
"
\n\t
"
.
join
(
libs
+
libs3
),
file
=
sys
.
stderr
)
execute
([
"libtool"
,
"-static"
,
"-o"
,
res
]
+
libs
+
libs3
)
...
...
samples/cpp/example_cmake/CMakeLists.txt
浏览文件 @
86ddff0b
...
...
@@ -18,6 +18,7 @@ find_package(OpenCV REQUIRED)
# in the OpenCVConfig.cmake file.
# Print some message showing some of them
message
(
STATUS
"OpenCV library status:"
)
message
(
STATUS
" config:
${
OpenCV_DIR
}
"
)
message
(
STATUS
" version:
${
OpenCV_VERSION
}
"
)
message
(
STATUS
" libraries:
${
OpenCV_LIBS
}
"
)
message
(
STATUS
" include path:
${
OpenCV_INCLUDE_DIRS
}
"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录