Commit ca762286 authored by David Cole's avatar David Cole
Browse files

ENH: Merge changes from main tree into VTK-5-0 branch. (cvs -q up -j1.24...

ENH: Merge changes from main tree into VTK-5-0 branch. (cvs -q up -j1.24 -j1.25 IO/Testing/Cxx/CMakeLists.txt)
parent 714e38d9
......@@ -2,11 +2,11 @@ SET(KIT IO)
SET(ConditionalTests)
IF(WIN32 AND VTK_USE_VIDEO_FOR_WINDOWS)
SET(ConditionalTests TestAVIWriter.cxx)
SET(ConditionalTests ${ConditionalTests} TestAVIWriter.cxx)
ENDIF(WIN32 AND VTK_USE_VIDEO_FOR_WINDOWS)
IF(DEFINED vtkMPEG2Encode_INCLUDE_PATH)
IF(VTK_USE_MPEG2_ENCODER)
SET(ConditionalTests ${ConditionalTests} TestMovieWriter.cxx)
ENDIF(DEFINED vtkMPEG2Encode_INCLUDE_PATH)
ENDIF(VTK_USE_MPEG2_ENCODER)
CREATE_TEST_SOURCELIST(Tests ${KIT}CxxTests.cxx
TestXML.cxx
......@@ -26,6 +26,6 @@ ENDIF (VTK_DATA_ROOT)
IF(WIN32 AND VTK_USE_VIDEO_FOR_WINDOWS)
ADD_TEST(TestAVIWriter ${CXX_TEST_PATH}/${KIT}CxxTests TestAVIWriter)
ENDIF(WIN32 AND VTK_USE_VIDEO_FOR_WINDOWS)
IF(DEFINED vtkMPEG2Encode_INCLUDE_PATH)
IF(VTK_USE_MPEG2_ENCODER)
ADD_TEST(TestMovieWriter ${CXX_TEST_PATH}/${KIT}CxxTests TestMovieWriter)
ENDIF(DEFINED vtkMPEG2Encode_INCLUDE_PATH)
ENDIF(VTK_USE_MPEG2_ENCODER)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment