More accurate guards for WinRT features in CMake.
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user