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
4c1cbffd
Commit
4c1cbffd
authored
Jul 14, 2015
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4184 from alalek:fix_cmake_status
parents
f7792667
aa871ca5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
11 deletions
+10
-11
OpenCVModule.cmake
cmake/OpenCVModule.cmake
+3
-3
CMakeLists.txt
modules/highgui/CMakeLists.txt
+6
-6
CMakeLists.txt
modules/videoio/CMakeLists.txt
+1
-2
No files found.
cmake/OpenCVModule.cmake
View file @
4c1cbffd
...
...
@@ -720,15 +720,15 @@ macro(_ocv_create_module)
set
(
sub_links
""
)
set
(
cuda_objs
""
)
if
(
OPENCV_MODULE_
${
the_module
}
_CHILDREN
)
status
(
"Complex module
${
the_module
}
"
)
message
(
STATUS
"Complex module
${
the_module
}
"
)
foreach
(
m
${
OPENCV_MODULE_
${
the_module
}
_CHILDREN
}
)
if
(
BUILD_
${
m
}
AND TARGET
${
m
}
_object
)
get_target_property
(
_sub_links
${
m
}
LINK_LIBRARIES
)
list
(
APPEND sub_objs $<TARGET_OBJECTS:
${
m
}
_object>
)
list
(
APPEND sub_links
${
_sub_links
}
)
status
(
" +
${
m
}
"
)
message
(
STATUS
" +
${
m
}
"
)
else
()
status
(
" -
${
m
}
"
)
message
(
STATUS
" -
${
m
}
"
)
endif
()
list
(
APPEND cuda_objs
${
OPENCV_MODULE_
${
m
}
_CUDA_OBJECTS
}
)
endforeach
()
...
...
modules/highgui/CMakeLists.txt
View file @
4c1cbffd
...
...
@@ -76,7 +76,7 @@ elseif(WINRT)
# Enabling it for WiRT 8.1+ only.
# WinRT 8.1+ detected. Adding WinRT API header.
status
(
"
${
name
}
: WinRT detected. Adding WinRT API header"
)
message
(
STATUS
"
${
name
}
: WinRT detected. Adding WinRT API header"
)
list
(
APPEND highgui_ext_hdrs
"
${
CMAKE_CURRENT_LIST_DIR
}
/include/opencv2/
${
name
}
/highgui_winrt.hpp"
)
...
...
@@ -92,16 +92,16 @@ elseif(WINRT)
if
(
WINRT_PHONE
OR
(
OpenCV_ARCH STREQUAL
"ARM"
))
list
(
REMOVE_ITEM HIGHGUI_LIBRARIES
"comctl32"
"gdi32"
"ole32"
"setupapi"
)
if
(
WINRT_PHONE
)
status
(
"
${
name
}
: Windows Phone detected"
)
message
(
STATUS
"
${
name
}
: Windows Phone detected"
)
elseif
(
OpenCV_ARCH STREQUAL
"ARM"
)
status
(
"
${
name
}
: ARM detected"
)
message
(
STATUS
"
${
name
}
: ARM detected"
)
if
(
WINRT_STORE
)
list
(
REMOVE_ITEM HIGHGUI_LIBRARIES
"ws2_32"
)
status
(
"
${
name
}
: Removing 'ws2_32.lib'"
)
message
(
STATUS
"
${
name
}
: Removing 'ws2_32.lib'"
)
endif
()
endif
()
status
(
"
${
name
}
: Removing 'comctl32.lib, gdi32.lib, ole32.lib, setupapi.lib'"
)
status
(
"
${
name
}
: Leaving '
${
HIGHGUI_LIBRARIES
}
'"
)
message
(
STATUS
"
${
name
}
: Removing 'comctl32.lib, gdi32.lib, ole32.lib, setupapi.lib'"
)
message
(
STATUS
"
${
name
}
: Leaving '
${
HIGHGUI_LIBRARIES
}
'"
)
endif
()
elseif
(
HAVE_WIN32UI
)
list
(
APPEND highgui_srcs
${
CMAKE_CURRENT_LIST_DIR
}
/src/window_w32.cpp
)
...
...
modules/videoio/CMakeLists.txt
View file @
4c1cbffd
...
...
@@ -33,7 +33,6 @@ file(GLOB videoio_ext_hdrs
"
${
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
...
...
@@ -42,7 +41,7 @@ list(REMOVE_ITEM videoio_ext_hdrs "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${n
if
(
DEFINED WINRT AND NOT DEFINED WINRT_8_0
)
# WinRT detected. Adding WinRT API header
status
(
"
${
name
}
: WinRT detected. Adding WinRT API header"
)
message
(
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
...
...
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