Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
429cd85b
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,发现更多精彩内容 >>
提交
429cd85b
编写于
3月 20, 2013
作者:
A
Alexander Smorkalov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
More accurate guards for WinRT features in CMake.
上级
3d594c70
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
19 addition
and
15 deletion
+19
-15
3rdparty/tbb/CMakeLists.txt
3rdparty/tbb/CMakeLists.txt
+2
-2
CMakeLists.txt
CMakeLists.txt
+1
-6
cmake/OpenCVDetectCXXCompiler.cmake
cmake/OpenCVDetectCXXCompiler.cmake
+2
-0
modules/highgui/CMakeLists.txt
modules/highgui/CMakeLists.txt
+8
-4
platforms/winrt/arm.winrt.toolchain.cmake
platforms/winrt/arm.winrt.toolchain.cmake
+5
-0
platforms/winrt/scripts/cmake_winrt.cmd
platforms/winrt/scripts/cmake_winrt.cmd
+1
-3
未找到文件。
3rdparty/tbb/CMakeLists.txt
浏览文件 @
429cd85b
...
...
@@ -123,7 +123,7 @@ file(GLOB lib_hdrs "${tbb_src_dir}/src/tbb/*.h")
list
(
APPEND lib_srcs
"
${
tbb_src_dir
}
/src/rml/client/rml_tbb.cpp"
)
if
(
WIN32
)
add_definitions
(
-D__TBB_DYNAMIC_LOAD_ENABLED=0
add_definitions
(
-D__TBB_DYNAMIC_LOAD_ENABLED=0
-D__TBB_BUILD=1
-D_UNICODE
-DUNICODE
...
...
@@ -162,7 +162,7 @@ endif()
set
(
TBB_SOURCE_FILES
${
lib_srcs
}
${
lib_hdrs
}
)
if
(
(
${
CMAKE_SYSTEM_PROCESSOR
}
MATCHES
"arm"
)
AND NOT WIN32
)
if
(
ARM
AND NOT WIN32
)
if
(
NOT ANDROID
)
set
(
TBB_SOURCE_FILES
${
TBB_SOURCE_FILES
}
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/arm_linux_stub.cpp"
)
endif
()
...
...
CMakeLists.txt
浏览文件 @
429cd85b
...
...
@@ -60,11 +60,6 @@ endif()
project
(
OpenCV CXX C
)
if
((
${
CMAKE_SYSTEM_PROCESSOR
}
MATCHES
"arm"
)
AND WIN32
)
set
(
CMAKE_REQUIRED_DEFINITIONS -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE
)
add_definitions
(
-D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE
)
endif
()
include
(
cmake/OpenCVUtils.cmake
)
# ----------------------------------------------------------------------------
...
...
@@ -613,7 +608,7 @@ else()
status
(
" QT 4.x:"
NO
)
endif
()
if
(
WIN32
)
status
(
" Win32 UI:"
NO
)
status
(
" Win32 UI:"
ARM THEN NO ELSE YES
)
else
()
if
(
APPLE
)
if
(
WITH_CARBON
)
...
...
cmake/OpenCVDetectCXXCompiler.cmake
浏览文件 @
429cd85b
...
...
@@ -103,4 +103,6 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*" OR CMAKE_GENERATOR
set
(
X86_64 1
)
elseif
(
CMAKE_SYSTEM_PROCESSOR MATCHES
"i686.*|i386.*|x86.*|amd64.*|AMD64.*"
)
set
(
X86 1
)
elseif
(
CMAKE_SYSTEM_PROCESSOR MATCHES
"arm.*|ARM.*"
)
set
(
ARM 1
)
endif
()
modules/highgui/CMakeLists.txt
浏览文件 @
429cd85b
...
...
@@ -90,7 +90,9 @@ if(HAVE_QT)
set_source_files_properties
(
${
_RCC_OUTFILES
}
PROPERTIES COMPILE_FLAGS -Wno-missing-declarations
)
endif
()
elseif
(
WIN32
)
#list(APPEND highgui_srcs src/window_w32.cpp)
if
(
NOT ARM
)
list
(
APPEND highgui_srcs src/window_w32.cpp
)
endif
()
elseif
(
HAVE_GTK
)
list
(
APPEND highgui_srcs src/window_gtk.cpp
)
elseif
(
APPLE
)
...
...
@@ -105,10 +107,12 @@ elseif(APPLE)
endif
()
endif
()
#
if(WIN32)
if
(
WIN32
)
list
(
APPEND highgui_srcs src/cap_dshow.cpp
)
#list(APPEND highgui_srcs src/cap_vfw.cpp src/cap_cmu.cpp)
#endif(WIN32)
if
(
NOT ARM
)
list
(
APPEND highgui_srcs src/cap_vfw.cpp src/cap_cmu.cpp
)
endif
()
endif
(
WIN32
)
if
(
HAVE_XINE
)
list
(
APPEND highgui_srcs src/cap_xine.cpp
)
...
...
platforms/winrt/arm.winrt.toolchain.cmake
0 → 100644
浏览文件 @
429cd85b
set
(
CMAKE_SYSTEM_NAME Windows
)
# WindowsRT breaks cmake 2.8.10.2 and earler
set
(
CMAKE_SYSTEM_PROCESSOR
"arm"
)
set
(
CMAKE_REQUIRED_DEFINITIONS -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE
)
add_definitions
(
-D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE
)
\ No newline at end of file
platforms/winrt/scripts/cmake_winrt.cmd
浏览文件 @
429cd85b
...
...
@@ -3,6 +3,4 @@ cd build
rem call "C:\Program Files\Microsoft Visual Studio 11.0\VC\bin\x86_arm\vcvarsx86_arm.bat"
SET
PATH
=
C
:\Program
Files
\Ninja
;
%PATH%
"C:\Program Files\CMake 2.8\bin\cmake.exe"
-GNinja -DCMAKE
_BUILD_TYPE
=
Release
-DWITH
_TIFF
=
OFF
-DWITH
_FFMPEG
=
OFF
-DBUILD
_opencv_gpu
=
OFF
-DENABLE
_SSE
=
OFF
-DENABLE
_SSE2
=
OFF
..\..\..
\ No newline at end of file
cmake
.exe
-GNinja -DWITH
_FFMPEG
=
OFF
-DBUILD
_opencv_gpu
=
OFF
-DBUILD
_opencv_python
=
OFF
-DCMAKE
_TOOLCHAIN_FILE
=
..\..\winrt\arm.winrt.toolchain.cmake ..\..\..
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录