Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
55f78f8a
Commit
55f78f8a
authored
May 15, 2015
by
Maxim Kostin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added configuration changes enabling videoio WinRT support.
Signed-off-by:
Maxim Kostin
<
v-maxkos@microsoft.com
>
parent
d08cb6b3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
53 additions
and
5 deletions
+53
-5
CMakeLists.txt
CMakeLists.txt
+18
-0
CMakeLists.txt
modules/videoio/CMakeLists.txt
+31
-5
CMakeLists.txt
modules/videostab/CMakeLists.txt
+4
-0
No files found.
CMakeLists.txt
View file @
55f78f8a
...
@@ -45,6 +45,24 @@ endif(CMAKE_SYSTEM_NAME MATCHES WindowsPhone OR CMAKE_SYSTEM_NAME MATCHES Window
...
@@ -45,6 +45,24 @@ endif(CMAKE_SYSTEM_NAME MATCHES WindowsPhone OR CMAKE_SYSTEM_NAME MATCHES Window
if
(
WINRT
)
if
(
WINRT
)
add_definitions
(
-DWINRT -DNO_GETENV
)
add_definitions
(
-DWINRT -DNO_GETENV
)
# Making definitions available to other configurations and
# to filter dependency restrictions at compile time.
if
(
CMAKE_SYSTEM_NAME MATCHES WindowsPhone
)
set
(
WINRT_PHONE TRUE
)
add_definitions
(
-DWINRT_PHONE
)
elseif
(
CMAKE_SYSTEM_NAME MATCHES WindowsStore
)
set
(
WINRT_STORE TRUE
)
add_definitions
(
-DWINRT_STORE
)
endif
()
if
(
CMAKE_SYSTEM_VERSION MATCHES 8.1
)
set
(
WINRT_8_1 TRUE
)
add_definitions
(
-DWINRT_8_1
)
elseif
(
CMAKE_SYSTEM_VERSION MATCHES 8.0
)
set
(
WINRT_8_0 TRUE
)
add_definitions
(
-DWINRT_8_0
)
endif
()
endif
()
endif
()
if
(
POLICY CMP0022
)
if
(
POLICY CMP0022
)
...
...
modules/videoio/CMakeLists.txt
View file @
55f78f8a
if
(
WINRT
)
ocv_module_disable
(
videoio
)
endif
()
set
(
the_description
"Media I/O"
)
set
(
the_description
"Media I/O"
)
ocv_add_module
(
videoio opencv_imgproc opencv_imgcodecs OPTIONAL opencv_androidcamera WRAP java python
)
ocv_add_module
(
videoio opencv_imgproc opencv_imgcodecs OPTIONAL opencv_androidcamera WRAP java python
)
...
@@ -11,7 +7,7 @@ ocv_add_module(videoio opencv_imgproc opencv_imgcodecs OPTIONAL opencv_androidca
...
@@ -11,7 +7,7 @@ ocv_add_module(videoio opencv_imgproc opencv_imgcodecs OPTIONAL opencv_androidca
# Jose Luis Blanco, 2008
# Jose Luis Blanco, 2008
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
if
(
HAVE_WINRT_CX AND NOT WINRT
)
if
(
WINRT_8_1
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
/ZW"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
/ZW"
)
endif
()
endif
()
...
@@ -36,6 +32,36 @@ file(GLOB videoio_ext_hdrs
...
@@ -36,6 +32,36 @@ file(GLOB videoio_ext_hdrs
"
${
CMAKE_CURRENT_LIST_DIR
}
/include/opencv2/
${
name
}
/*.hpp"
"
${
CMAKE_CURRENT_LIST_DIR
}
/include/opencv2/
${
name
}
/*.hpp"
"
${
CMAKE_CURRENT_LIST_DIR
}
/include/opencv2/
${
name
}
/*.h"
)
"
${
CMAKE_CURRENT_LIST_DIR
}
/include/opencv2/
${
name
}
/*.h"
)
# Removing WinRT API headers by default
status
(
"
${
name
}
: Removing WinRT API headers by default"
)
list
(
REMOVE_ITEM videoio_ext_hdrs
"
${
CMAKE_CURRENT_LIST_DIR
}
/include/opencv2/
${
name
}
/cap_winrt.hpp"
)
# Dependencies used by the implementation referenced
# below are not available on WinRT 8.0.
# Enabling it for WiRT 8.1+ only.
if
(
DEFINED WINRT AND NOT DEFINED WINRT_8_0
)
# WinRT detected. Adding WinRT API header
status
(
"
${
name
}
: WinRT detected. Adding WinRT API header"
)
list
(
APPEND videoio_ext_hdrs
"
${
CMAKE_CURRENT_LIST_DIR
}
/include/opencv2/
${
name
}
/cap_winrt.hpp"
)
# Adding WinRT internal sources and headers
list
(
APPEND videoio_srcs
${
CMAKE_CURRENT_LIST_DIR
}
/src/cap_winrt_capture.cpp
${
CMAKE_CURRENT_LIST_DIR
}
/src/cap_winrt_bridge.cpp
${
CMAKE_CURRENT_LIST_DIR
}
/src/cap_winrt_video.cpp
${
CMAKE_CURRENT_LIST_DIR
}
/src/cap_winrt/CaptureFrameGrabber.cpp
${
CMAKE_CURRENT_LIST_DIR
}
/src/cap_winrt/MediaStreamSink.cpp
)
list
(
APPEND videoio_hdrs
${
CMAKE_CURRENT_LIST_DIR
}
/src/cap_winrt_capture.hpp
${
CMAKE_CURRENT_LIST_DIR
}
/src/cap_winrt_bridge.hpp
${
CMAKE_CURRENT_LIST_DIR
}
/src/cap_winrt_video.hpp
${
CMAKE_CURRENT_LIST_DIR
}
/src/cap_winrt/MFIncludes.hpp
${
CMAKE_CURRENT_LIST_DIR
}
/src/cap_winrt/CaptureFrameGrabber.hpp
${
CMAKE_CURRENT_LIST_DIR
}
/src/cap_winrt/MediaSink.hpp
${
CMAKE_CURRENT_LIST_DIR
}
/src/cap_winrt/MediaStreamSink.hpp
)
endif
()
if
(
WIN32 AND NOT ARM
)
if
(
WIN32 AND NOT ARM
)
list
(
APPEND videoio_srcs
${
CMAKE_CURRENT_LIST_DIR
}
/src/cap_cmu.cpp
)
list
(
APPEND videoio_srcs
${
CMAKE_CURRENT_LIST_DIR
}
/src/cap_cmu.cpp
)
endif
()
endif
()
...
...
modules/videostab/CMakeLists.txt
View file @
55f78f8a
...
@@ -4,5 +4,9 @@ if(HAVE_CUDA)
...
@@ -4,5 +4,9 @@ if(HAVE_CUDA)
ocv_warnings_disable
(
CMAKE_CXX_FLAGS -Wundef -Wmissing-declarations -Wshadow -Wunused-parameter
)
ocv_warnings_disable
(
CMAKE_CXX_FLAGS -Wundef -Wmissing-declarations -Wshadow -Wunused-parameter
)
endif
()
endif
()
if
(
WINRT_8_1
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
/ZW"
)
endif
()
ocv_define_module
(
videostab opencv_imgproc opencv_features2d opencv_video opencv_photo opencv_calib3d
ocv_define_module
(
videostab opencv_imgproc opencv_features2d opencv_video opencv_photo opencv_calib3d
OPTIONAL opencv_cudawarping opencv_cudaoptflow opencv_videoio WRAP python
)
OPTIONAL opencv_cudawarping opencv_cudaoptflow opencv_videoio WRAP python
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment