Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
79df8db7
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,发现更多精彩内容 >>
提交
79df8db7
编写于
6月 08, 2012
作者:
A
Andrey Kamaev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed recently introduced build problems on some platforms
上级
f62028dc
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
49 addition
and
11 deletion
+49
-11
3rdparty/zlib/zconf.h.cmakein
3rdparty/zlib/zconf.h.cmakein
+1
-1
CMakeLists.txt
CMakeLists.txt
+2
-1
cmake/OpenCVFindLibsGrfmt.cmake
cmake/OpenCVFindLibsGrfmt.cmake
+10
-0
cmake/OpenCVModule.cmake
cmake/OpenCVModule.cmake
+3
-3
cmake/OpenCVUtils.cmake
cmake/OpenCVUtils.cmake
+30
-3
modules/highgui/CMakeLists.txt
modules/highgui/CMakeLists.txt
+3
-3
未找到文件。
3rdparty/zlib/zconf.h.cmakein
浏览文件 @
79df8db7
...
@@ -410,7 +410,7 @@ typedef uLong FAR uLongf;
...
@@ -410,7 +410,7 @@ typedef uLong FAR uLongf;
* both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
* both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
* equivalently requesting no 64-bit operations
* equivalently requesting no 64-bit operations
*/
*/
#if -_LARGEFILE64_SOURCE - -1 == 1
#if
defined _LARGEFILE64_SOURCE &&
-_LARGEFILE64_SOURCE - -1 == 1
# undef _LARGEFILE64_SOURCE
# undef _LARGEFILE64_SOURCE
#endif
#endif
...
...
CMakeLists.txt
浏览文件 @
79df8db7
...
@@ -481,6 +481,7 @@ else()
...
@@ -481,6 +481,7 @@ else()
status
(
" Linker flags (Release):"
${
CMAKE_SHARED_LINKER_FLAGS
}
${
CMAKE_SHARED_LINKER_FLAGS_RELEASE
}
)
status
(
" Linker flags (Release):"
${
CMAKE_SHARED_LINKER_FLAGS
}
${
CMAKE_SHARED_LINKER_FLAGS_RELEASE
}
)
status
(
" Linker flags (Debug):"
${
CMAKE_SHARED_LINKER_FLAGS
}
${
CMAKE_SHARED_LINKER_FLAGS_DEBUG
}
)
status
(
" Linker flags (Debug):"
${
CMAKE_SHARED_LINKER_FLAGS
}
${
CMAKE_SHARED_LINKER_FLAGS_DEBUG
}
)
endif
()
endif
()
status
(
" Precompiled headers:"
PCHSupport_FOUND AND ENABLE_PRECOMPILED_HEADERS THEN YES ELSE NO
)
# ========================== OpenCV modules ==========================
# ========================== OpenCV modules ==========================
status
(
""
)
status
(
""
)
...
@@ -570,7 +571,7 @@ if(WITH_TIFF)
...
@@ -570,7 +571,7 @@ if(WITH_TIFF)
if
(
TIFF_VERSION_STRING AND TIFF_FOUND
)
if
(
TIFF_VERSION_STRING AND TIFF_FOUND
)
status
(
" TIFF:"
"
${
TIFF_LIBRARY
}
(ver
${
TIFF_VERSION
}
-
${
TIFF_VERSION_STRING
}
)"
)
status
(
" TIFF:"
"
${
TIFF_LIBRARY
}
(ver
${
TIFF_VERSION
}
-
${
TIFF_VERSION_STRING
}
)"
)
else
()
else
()
status
(
" TIFF:"
TIFF_FOUND THEN
"
${
TIFF_LIBRARY
}
(ver
${
TIFF_VERSION
}
)"
ELSE
"build (ver
${
TIFF_VERSION
}
)"
)
status
(
" TIFF:"
TIFF_FOUND THEN
"
${
TIFF_LIBRARY
}
(ver
${
TIFF_VERSION
}
)"
ELSE
"build (ver
${
TIFF_VERSION
}
-
${
TIFF_VERSION_STRING
}
)"
)
endif
()
endif
()
else
()
else
()
status
(
" TIFF:"
"NO"
)
status
(
" TIFF:"
"NO"
)
...
...
cmake/OpenCVFindLibsGrfmt.cmake
浏览文件 @
79df8db7
...
@@ -61,6 +61,16 @@ if(TIFF_BIGTIFF_VERSION AND NOT TIFF_VERSION_BIG)
...
@@ -61,6 +61,16 @@ if(TIFF_BIGTIFF_VERSION AND NOT TIFF_VERSION_BIG)
set
(
TIFF_VERSION_BIG
${
TIFF_BIGTIFF_VERSION
}
)
set
(
TIFF_VERSION_BIG
${
TIFF_BIGTIFF_VERSION
}
)
endif
()
endif
()
if
(
NOT TIFF_VERSION_STRING AND TIFF_INCLUDE_DIR
)
list
(
GET TIFF_INCLUDE_DIR 0 _TIFF_INCLUDE_DIR
)
if
(
EXISTS
"
${
_TIFF_INCLUDE_DIR
}
/tiffvers.h"
)
file
(
STRINGS
"
${
_TIFF_INCLUDE_DIR
}
/tiffvers.h"
tiff_version_str REGEX
"^#define[
\t
]+TIFFLIB_VERSION_STR[
\t
]+
\"
LIBTIFF, Version .*"
)
string
(
REGEX REPLACE
"^#define[
\t
]+TIFFLIB_VERSION_STR[
\t
]+
\"
LIBTIFF, Version +([^
\\
n]*).*"
"
\\
1"
TIFF_VERSION_STRING
"
${
tiff_version_str
}
"
)
unset
(
tiff_version_str
)
endif
()
unset
(
_TIFF_INCLUDE_DIR
)
endif
()
# --- libjpeg (optional) ---
# --- libjpeg (optional) ---
if
(
WITH_JPEG
)
if
(
WITH_JPEG
)
if
(
BUILD_JPEG
)
if
(
BUILD_JPEG
)
...
...
cmake/OpenCVModule.cmake
浏览文件 @
79df8db7
cmake/OpenCVUtils.cmake
浏览文件 @
79df8db7
...
@@ -32,6 +32,32 @@ macro(ocv_clear_vars)
...
@@ -32,6 +32,32 @@ macro(ocv_clear_vars)
endforeach
()
endforeach
()
endmacro
()
endmacro
()
include
(
CheckCXXCompilerFlag
)
include
(
CheckCCompilerFlag
)
macro
(
ocv_check_flag_support lang flag varname
)
if
(
"_
${
lang
}
_"
MATCHES
"_CXX_"
)
set
(
_lang CXX
)
elseif
(
"_
${
lang
}
_"
MATCHES
".*_C_.*"
)
set
(
_lang C
)
else
()
set
(
_lang
${
lang
}
)
endif
()
string
(
TOUPPER
"
${
flag
}
"
${
varname
}
)
string
(
REGEX REPLACE
"^(/|-)"
"HAVE_
${
_lang
}
_"
${
varname
}
"
${${
varname
}}
"
)
string
(
REPLACE
"-"
"_"
${
varname
}
"
${${
varname
}}
"
)
if
(
_lang STREQUAL
"CXX"
)
CHECK_CXX_COMPILER_FLAG
(
${
flag
}
${${
varname
}}
)
elseif
(
_lang STREQUAL
"C"
)
CHECK_C_COMPILER_FLAG
(
"
${
flag
}
"
${${
varname
}}
)
else
()
set
(
${
varname
}
FALSE
)
endif
()
endmacro
()
# turns off warnings
# turns off warnings
macro
(
ocv_warnings_disable
)
macro
(
ocv_warnings_disable
)
if
(
NOT ENABLE_NOISY_WARNINGS
)
if
(
NOT ENABLE_NOISY_WARNINGS
)
...
@@ -56,11 +82,12 @@ macro(ocv_warnings_disable)
...
@@ -56,11 +82,12 @@ macro(ocv_warnings_disable)
elseif
(
CV_COMPILER_IS_GNU AND _gxx_warnings AND _flag_vars
)
elseif
(
CV_COMPILER_IS_GNU AND _gxx_warnings AND _flag_vars
)
foreach
(
var
${
_flag_vars
}
)
foreach
(
var
${
_flag_vars
}
)
foreach
(
warning
${
_gxx_warnings
}
)
foreach
(
warning
${
_gxx_warnings
}
)
if
(
warning MATCHES
"^-Wno-"
)
if
(
NOT warning MATCHES
"^-Wno-"
)
set
(
${
var
}
"
${${
var
}}
${
warning
}
"
)
else
()
string
(
REPLACE
"
${
warning
}
"
""
${
var
}
"
${${
var
}}
"
)
string
(
REPLACE
"
${
warning
}
"
""
${
var
}
"
${${
var
}}
"
)
string
(
REPLACE
"-W"
"-Wno-"
warning
"
${
warning
}
"
)
string
(
REPLACE
"-W"
"-Wno-"
warning
"
${
warning
}
"
)
endif
()
ocv_check_flag_support
(
${
var
}
"
${
warning
}
"
_varname
)
if
(
${
_varname
}
)
set
(
${
var
}
"
${${
var
}}
${
warning
}
"
)
set
(
${
var
}
"
${${
var
}}
${
warning
}
"
)
endif
()
endif
()
endforeach
()
endforeach
()
...
...
modules/highgui/CMakeLists.txt
浏览文件 @
79df8db7
...
@@ -82,7 +82,8 @@ if(HAVE_QT)
...
@@ -82,7 +82,8 @@ if(HAVE_QT)
list
(
APPEND HIGHGUI_LIBRARIES
${
QT_LIBRARIES
}
${
QT_QTTEST_LIBRARY
}
)
list
(
APPEND HIGHGUI_LIBRARIES
${
QT_LIBRARIES
}
${
QT_QTTEST_LIBRARY
}
)
list
(
APPEND highgui_srcs src/window_QT.cpp
${
_MOC_OUTFILES
}
${
_RCC_OUTFILES
}
)
list
(
APPEND highgui_srcs src/window_QT.cpp
${
_MOC_OUTFILES
}
${
_RCC_OUTFILES
}
)
if
(
CMAKE_COMPILER_IS_GNUCXX
)
CHECK_CXX_COMPILER_FLAG
(
-Wno-missing-declarations HAVE_CXX_WNO_MISSING_DECLARATIONS
)
if
(
HAVE_CXX_WNO_MISSING_DECLARATIONS
)
set_source_files_properties
(
${
_RCC_OUTFILES
}
PROPERTIES COMPILE_FLAGS
"-Wno-missing-declarations"
)
set_source_files_properties
(
${
_RCC_OUTFILES
}
PROPERTIES COMPILE_FLAGS
"-Wno-missing-declarations"
)
endif
()
endif
()
elseif
(
WIN32
)
elseif
(
WIN32
)
...
@@ -170,7 +171,6 @@ if(WITH_IMAGEIO)
...
@@ -170,7 +171,6 @@ if(WITH_IMAGEIO)
if
(
IOS
)
if
(
IOS
)
list
(
APPEND HIGHGUI_LIBRARIES
"-framework ImageIO"
)
list
(
APPEND HIGHGUI_LIBRARIES
"-framework ImageIO"
)
endif
()
endif
()
#TODO: check if need to link with some framework on OS X: -framework ApplicationServices ??
endif
(
WITH_IMAGEIO
)
endif
(
WITH_IMAGEIO
)
if
(
WITH_AVFOUNDATION
)
if
(
WITH_AVFOUNDATION
)
...
@@ -224,7 +224,7 @@ endif()
...
@@ -224,7 +224,7 @@ endif()
set_target_properties
(
${
the_module
}
PROPERTIES LINK_INTERFACE_LIBRARIES
""
)
set_target_properties
(
${
the_module
}
PROPERTIES LINK_INTERFACE_LIBRARIES
""
)
ocv_add_precompiled_headers
(
${
the_module
}
)
ocv_add_precompiled_headers
(
${
the_module
}
)
ocv_warnings_disable
(
CMAKE_C_FLAGS -Wno-deprecated-declarations
)
ocv_warnings_disable
(
CMAKE_C
XX
_FLAGS -Wno-deprecated-declarations
)
if
(
WIN32 AND WITH_FFMPEG
)
if
(
WIN32 AND WITH_FFMPEG
)
#copy ffmpeg dll to the output folder
#copy ffmpeg dll to the output folder
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录