Skip to content
Snippets Groups Projects
Commit 317e4df4 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot
Browse files

Merge topic 'IOMovie-more-simplification'


a362058a IOMovie: remove unnecessary WIN32 check
2d15c5f8 IOMovie: wrap CMake output strings

Acked-by: default avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Cory Quammen's avatarCory Quammen <cory.quammen@kitware.com>
Merge-request: !8390
parents 514d120b a362058a
Branches
No related tags found
No related merge requests found
......@@ -15,7 +15,8 @@ if (VTK_USE_VIDEO_FOR_WINDOWS)
if (NOT vtk_video_for_windows_works)
message(FATAL_ERROR
"`VTK_USE_VIDEO_FOR_WINDOWS` was requested, but support detection failed: ${_vfw_output}.")
"`VTK_USE_VIDEO_FOR_WINDOWS` was requested, but support detection "
"failed: ${_vfw_output}.")
endif ()
endif ()
......@@ -38,7 +39,8 @@ if (VTK_USE_MICROSOFT_MEDIA_FOUNDATION)
if (NOT vtk_microsoft_media_foundation_works)
message(FATAL_ERROR
"`VTK_USE_MICROSOFT_MEDIA_FOUNDATION` was requested, but support detection failed: ${_msmf_output}.")
"`VTK_USE_MICROSOFT_MEDIA_FOUNDATION` was requested, but support "
"detection failed: ${_msmf_output}.")
endif ()
endif ()
......@@ -56,15 +58,13 @@ vtk_module_add_module(VTK::IOMovie
HEADERS "${CMAKE_CURRENT_BINARY_DIR}/vtkIOMovieConfigure.h")
set(libs)
if (WIN32)
if (VTK_USE_VIDEO_FOR_WINDOWS)
list(APPEND libs vfw32)
endif ()
if (VTK_USE_VIDEO_FOR_WINDOWS)
list(APPEND libs vfw32)
endif ()
if (VTK_USE_MICROSOFT_MEDIA_FOUNDATION)
list(APPEND libs mfreadwrite mfplat mfuuid)
endif()
if (VTK_USE_MICROSOFT_MEDIA_FOUNDATION)
list(APPEND libs mfreadwrite mfplat mfuuid)
endif()
vtk_module_link(VTK::IOMovie
PRIVATE ${libs})
endif ()
vtk_module_link(VTK::IOMovie
PRIVATE ${libs})
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment