Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
6aabf72b
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,发现更多精彩内容 >>
提交
6aabf72b
编写于
5月 31, 2011
作者:
A
Alexander Shishkov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
removed OPENCV_BUILD_SHARED_LIB in favor of BUILD_SHARED_LIBS
上级
926a6bba
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
7 addition
and
14 deletion
+7
-14
CMakeLists.txt
CMakeLists.txt
+0
-7
OpenCVConfig.cmake.in
OpenCVConfig.cmake.in
+2
-2
OpenCVModule.cmake
OpenCVModule.cmake
+1
-1
cvconfig.h.cmake
cvconfig.h.cmake
+1
-1
modules/core/src/system.cpp
modules/core/src/system.cpp
+1
-1
modules/gpu/CMakeLists.txt
modules/gpu/CMakeLists.txt
+1
-1
modules/highgui/CMakeLists.txt
modules/highgui/CMakeLists.txt
+1
-1
未找到文件。
CMakeLists.txt
浏览文件 @
6aabf72b
...
...
@@ -99,13 +99,6 @@ endif()
# ----------------------------------------------------------------------------
set
(
BUILD_SHARED_LIBS ON CACHE BOOL
"Build shared libraries (.dll/.so) instead of static ones (.lib/.a)"
)
if
(
BUILD_SHARED_LIBS
)
set
(
OPENCV_BUILD_SHARED_LIB 1
)
# For cvconfig.h, etc.
else
(
BUILD_SHARED_LIBS
)
set
(
OPENCV_BUILD_SHARED_LIB 0
)
endif
(
BUILD_SHARED_LIBS
)
# ----------------------------------------------------------------------------
# Variables for cvconfig.h.cmake
# ----------------------------------------------------------------------------
...
...
OpenCVConfig.cmake.in
浏览文件 @
6aabf72b
...
...
@@ -86,7 +86,7 @@ endif(NOT @CMAKE_BASE_INCLUDE_DIRS_CONFIGCMAKE@ STREQUAL "")
# For OpenCV built as static libs, we need the user to link against
# many more dependencies:
IF (NOT @
OPENCV_BUILD_SHARED_LIB
@)
IF (NOT @
BUILD_SHARED_LIBS
@)
# Under static libs, the user of OpenCV needs access to the 3rdparty libs as well:
LINK_DIRECTORIES(@CMAKE_LIB_DIRS_CONFIGCMAKE@/../3rdparty/lib)
if(WIN32)
...
...
@@ -112,7 +112,7 @@ IF (NOT @OPENCV_BUILD_SHARED_LIB@)
set(OpenCV_LIBS ${OpenCV_LIBS} ${OPENCV_EXTRA_COMPONENTS})
endif(CMAKE_MAJOR_VERSION GREATER 2 OR CMAKE_MINOR_VERSION GREATER 4)
ENDIF(NOT @
OPENCV_BUILD_SHARED_LIB
@)
ENDIF(NOT @
BUILD_SHARED_LIBS
@)
# ======================================================
...
...
OpenCVModule.cmake
浏览文件 @
6aabf72b
...
...
@@ -41,7 +41,7 @@ macro(define_opencv_module name)
set_target_properties
(
${
the_target
}
PROPERTIES FOLDER
"modules"
)
endif
()
if
(
OPENCV_BUILD_SHARED_LIB
)
if
(
BUILD_SHARED_LIBS
)
if
(
MSVC
)
set_target_properties
(
${
the_target
}
PROPERTIES DEFINE_SYMBOL CVAPI_EXPORTS
)
else
()
...
...
cvconfig.h.cmake
浏览文件 @
6aabf72b
...
...
@@ -122,7 +122,7 @@
#cmakedefine HAVE_IPP
/* OpenCV compiled as static or dynamic libs */
#cmakedefine
OPENCV_BUILD_SHARED_LIB
#cmakedefine
BUILD_SHARED_LIBS
/* Name of package */
#define PACKAGE "${PACKAGE}"
...
...
modules/core/src/system.cpp
浏览文件 @
6aabf72b
...
...
@@ -748,7 +748,7 @@ cvGetModuleInfo( const char* name, const char **version, const char **plugin_lis
*
plugin_list
=
plugin_list_buf
;
}
#if defined
OPENCV_BUILD_SHARED_LIB
&& defined CVAPI_EXPORTS && defined WIN32 && !defined WINCE
#if defined
BUILD_SHARED_LIBS
&& defined CVAPI_EXPORTS && defined WIN32 && !defined WINCE
BOOL
WINAPI
DllMain
(
HINSTANCE
,
DWORD
fdwReason
,
LPVOID
)
{
if
(
fdwReason
==
DLL_THREAD_DETACH
||
fdwReason
==
DLL_PROCESS_DETACH
)
...
...
modules/gpu/CMakeLists.txt
浏览文件 @
6aabf72b
...
...
@@ -68,7 +68,7 @@ if (HAVE_CUDA)
string
(
REPLACE
"/EHsc-"
"/EHs"
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
"
)
endif
()
if
(
OPENCV_BUILD_SHARED_LIB
)
if
(
BUILD_SHARED_LIBS
)
set
(
CUDA_NVCC_FLAGS
${
CUDA_NVCC_FLAGS
}
"-Xcompiler;-DCVAPI_EXPORTS"
)
endif
()
...
...
modules/highgui/CMakeLists.txt
浏览文件 @
6aabf72b
...
...
@@ -244,7 +244,7 @@ set(lib_srcs ${highgui_srcs} ${grfmt_srcs})
# ----------------------------------------------------------------------------------
set
(
the_target
"opencv_highgui"
)
if
(
OPENCV_BUILD_SHARED_LIB
)
if
(
BUILD_SHARED_LIBS
)
add_definitions
(
-DHIGHGUI_EXPORTS -DCVAPI_EXPORTS
)
endif
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录