From ed5ef030019972881bb9a45c34578b56e0f22bbd Mon Sep 17 00:00:00 2001
From: Bill Lorensen <bill.lorensen@gmail.com>
Date: Sat, 21 Oct 2017 08:35:02 -0700
Subject: [PATCH] ENH: Use Requires_Setting_On
Former-commit-id: fc81491fee9eb3544a2817fd831b3fe65134e6c5
---
src/Cxx/Video/CMakeLists.txt | 40 +++++++-----------------------------
1 file changed, 7 insertions(+), 33 deletions(-)
diff --git a/src/Cxx/Video/CMakeLists.txt b/src/Cxx/Video/CMakeLists.txt
index 5b6c70b17d5..2f01f6cbaba 100644
--- a/src/Cxx/Video/CMakeLists.txt
+++ b/src/Cxx/Video/CMakeLists.txt
@@ -8,41 +8,15 @@ ENDIF(NOT VTK_USE_RENDERING)
INCLUDE(${VTK_USE_FILE})
ENDIF(NOT WikiExamples_BINARY_DIR)
+include(${WikiExamples_SOURCE_DIR}/CMake/RequiresSettingOn.cmake)
+
+Requires_Setting_On(vtkAVIWriter VTK_USE_VIDEO_FOR_WINDOWS)
IF(WIN32)
IF(VTK_USE_VIDEO_FOR_WINDOWS)
- SET(Kit_SRCS ${Kit_SRCS} vtkAVIWriter.cxx)
SET(KIT_LIBS ${KIT_LIBS} vfw32)
ENDIF(VTK_USE_VIDEO_FOR_WINDOWS)
ENDIF(WIN32)
-
-# IF(VTK_USE_VIDEO_FOR_WINDOWS)
-# ADD_EXECUTABLE(AVI ${EXECUTABLE_FLAG} AVI.cxx)
-# TARGET_LINK_LIBRARIES(AVI vtkHybrid ${KIT_LIBS})
-# ENDIF(VTK_USE_VIDEO_FOR_WINDOWS)
-
-IF (VTK_USE_MPEG2_ENCODER)
- ADD_EXECUTABLE(MPEG2 ${EXECUTABLE_FLAG} MPEG2.cxx)
- TARGET_LINK_LIBRARIES(MPEG2 ${KIT_LIBS})
-ELSE (VTK_USE_MPEG2_ENCODER)
- set(SKIP "Cxx/Video/MPEG2")
- set(REQUIRE "VTK_USE_MPEG2_ENCODER")
- message(STATUS "VTKWikiExamples: ${SKIP} requires ${REQUIRE} and will not be built")
-ENDIF (VTK_USE_MPEG2_ENCODER)
-
-IF (VTK_USE_FFMPEG_ENCODER)
- ADD_EXECUTABLE(FFMPEG ${EXECUTABLE_FLAG} FFMPEG.cxx)
- TARGET_LINK_LIBRARIES(FFMPEG ${KIT_LIBS})
-ELSE (VTK_USE_FFMPEG_ENCODER)
- set(SKIP "Cxx/Video/FFMPEG")
- set(REQUIRE "VTK_USE_FFMPEG_ENCODER")
- message(STATUS "VTKWikiExamples: ${SKIP} requires ${REQUIRE} and will not be built")
-ENDIF (VTK_USE_FFMPEG_ENCODER)
-
-IF(VTK_USE_OGGTHEORA_ENCODER)
- ADD_EXECUTABLE(OggTheora ${EXECUTABLE_FLAG} OggTheora.cxx)
- TARGET_LINK_LIBRARIES(OggTheora ${KIT_LIBS})
-ELSE (VTK_USE_FFMPEG_ENCODER)
- set(SKIP "Cxx/Video/OggTheora")
- set(REQUIRE "VTK_USE_OGGTHEORA_ENCODER")
- message(STATUS "VTKWikiExamples: ${SKIP} requires ${REQUIRE} and will not be built")
-ENDIF(VTK_USE_OGGTHEORA_ENCODER)
+Requires_Setting_On(AVI VTK_USE_VIDEO_FOR_WINDOWS)
+Requires_Setting_On(MPEG2 VTK_USE_MPEG2_ENCODER)
+Requires_Setting_On(FFMPEG VTK_USE_FFMPEG2_ENCODER)
+Requires_Setting_On(OggTheora VTK_USE_OGGTHEORA_ENCODER)
--
GitLab