Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenCV
opencv
提交
9dfb15db
O
opencv
项目概览
OpenCV
/
opencv
上一次同步 9 个月
通知
994
Star
71100
Fork
55581
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
9dfb15db
编写于
12月 05, 2010
作者:
V
Vadim Pisarevsky
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
some more fixes for the static library configuration
上级
0de9c9fd
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
28 addition
and
10 deletion
+28
-10
3rdparty/lapack/CMakeLists.txt
3rdparty/lapack/CMakeLists.txt
+1
-6
3rdparty/libjasper/CMakeLists.txt
3rdparty/libjasper/CMakeLists.txt
+6
-0
3rdparty/libjpeg/CMakeLists.txt
3rdparty/libjpeg/CMakeLists.txt
+6
-0
3rdparty/libpng/CMakeLists.txt
3rdparty/libpng/CMakeLists.txt
+6
-0
3rdparty/libtiff/CMakeLists.txt
3rdparty/libtiff/CMakeLists.txt
+5
-0
3rdparty/zlib/CMakeLists.txt
3rdparty/zlib/CMakeLists.txt
+1
-3
CMakeLists.txt
CMakeLists.txt
+1
-1
OpenCVConfig.cmake.in
OpenCVConfig.cmake.in
+2
-0
未找到文件。
3rdparty/lapack/CMakeLists.txt
浏览文件 @
9dfb15db
...
...
@@ -62,13 +62,8 @@ set_target_properties(${the_target}
)
if
(
NOT BUILD_SHARED_LIBS
)
set_target_properties
(
${
the_target
}
PROPERTIES INSTALL_NAME_DIR
"
${
CMAKE_INSTALL_PREFIX
}
/lib"
)
install
(
TARGETS
${
the_target
}
RUNTIME DESTINATION bin COMPONENT main
LIBRARY DESTINATION lib COMPONENT main
ARCHIVE DESTINATION lib COMPONENT main
)
ARCHIVE DESTINATION share/opencv/3rdparty/lib COMPONENT main
)
endif
()
endif
()
#android
3rdparty/libjasper/CMakeLists.txt
浏览文件 @
9dfb15db
...
...
@@ -57,4 +57,10 @@ set_target_properties(${the_target}
DEBUG_POSTFIX
"
${
OPENCV_DEBUG_POSTFIX
}
"
ARCHIVE_OUTPUT_DIRECTORY
"
${
CMAKE_BINARY_DIR
}
/3rdparty/lib"
)
if
(
NOT BUILD_SHARED_LIBS
)
install
(
TARGETS
${
the_target
}
ARCHIVE DESTINATION share/opencv/3rdparty/lib COMPONENT main
)
endif
()
endif
(
ANDROID
)
#!android
3rdparty/libjpeg/CMakeLists.txt
浏览文件 @
9dfb15db
...
...
@@ -47,4 +47,10 @@ set_target_properties(${the_target}
DEBUG_POSTFIX
"
${
OPENCV_DEBUG_POSTFIX
}
"
ARCHIVE_OUTPUT_DIRECTORY
${
CMAKE_BINARY_DIR
}
/3rdparty/lib
)
if
(
NOT BUILD_SHARED_LIBS
)
install
(
TARGETS
${
the_target
}
ARCHIVE DESTINATION share/opencv/3rdparty/lib COMPONENT main
)
endif
()
endif
()
#android
3rdparty/libpng/CMakeLists.txt
浏览文件 @
9dfb15db
...
...
@@ -41,4 +41,10 @@ set_target_properties(${the_target}
DEBUG_POSTFIX
"
${
OPENCV_DEBUG_POSTFIX
}
"
ARCHIVE_OUTPUT_DIRECTORY
"
${
CMAKE_BINARY_DIR
}
/3rdparty/lib"
)
if
(
NOT BUILD_SHARED_LIBS
)
install
(
TARGETS
${
the_target
}
ARCHIVE DESTINATION share/opencv/3rdparty/lib COMPONENT main
)
endif
()
endif
()
#android
3rdparty/libtiff/CMakeLists.txt
浏览文件 @
9dfb15db
...
...
@@ -99,3 +99,8 @@ set_target_properties(${the_target}
DEBUG_POSTFIX
"
${
OPENCV_DEBUG_POSTFIX
}
"
ARCHIVE_OUTPUT_DIRECTORY
"
${
CMAKE_BINARY_DIR
}
/3rdparty/lib/"
)
if
(
NOT BUILD_SHARED_LIBS
)
install
(
TARGETS
${
the_target
}
ARCHIVE DESTINATION share/opencv/3rdparty/lib COMPONENT main
)
endif
()
3rdparty/zlib/CMakeLists.txt
浏览文件 @
9dfb15db
...
...
@@ -40,10 +40,8 @@ set_target_properties(${the_target}
)
if
(
NOT BUILD_SHARED_LIBS
)
set_target_properties
(
${
the_target
}
PROPERTIES INSTALL_NAME_DIR
"
${
CMAKE_INSTALL_PREFIX
}
/lib"
)
install
(
TARGETS
${
the_target
}
ARCHIVE DESTINATION lib COMPONENT main
)
ARCHIVE DESTINATION
share/opencv/3rdparty/
lib COMPONENT main
)
endif
()
endif
(
ANDROID
)
CMakeLists.txt
浏览文件 @
9dfb15db
...
...
@@ -490,7 +490,7 @@ if(WITH_JASPER AND NOT JASPER_FOUND)
set
(
JASPER_LIBRARIES libjasper
)
endif
()
message
(
STATUS
"Graphic libraries:
${
PNG_LIBRARIES
}
${
JPEG_LIBRARIES
}
${
TIFF_LIBRARIES
}
${
JASPER_LIBRARIES
}
"
)
#
message(STATUS "Graphic libraries: ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARIES} ${JASPER_LIBRARIES}")
if
(
WITH_OPENEXR
)
include
(
OpenCVFindOpenEXR.cmake
)
...
...
OpenCVConfig.cmake.in
浏览文件 @
9dfb15db
...
...
@@ -85,6 +85,8 @@ IF (NOT @OPENCV_BUILD_SHARED_LIB@)
LINK_DIRECTORIES(@CMAKE_LIB_DIRS_CONFIGCMAKE@/../3rdparty/lib)
if(WIN32)
LINK_DIRECTORIES(@CMAKE_BASE_INCLUDE_DIRS_CONFIGCMAKE@/3rdparty/lib)
else()
LINK_DIRECTORIES(@CMAKE_LIB_DIRS_CONFIGCMAKE@/../share/opencv/3rdparty/lib)
endif()
set(OpenCV_LIBS @OPENCV_LINKER_LIBS@ @IPP_LIBS@ @HIGHGUI_LIBRARIES@ ${OpenCV_LIBS})
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录