Commit 90764ae6 authored by Dave DeMarle's avatar Dave DeMarle
Browse files

Merge branch 'replace-deprecated-remove-cmake-command' into release

Change-Id: I0c28ac07fa0c62ba20fc91f89b58f423f6691faf
parents 4e394cfe 4372234c
......@@ -83,7 +83,7 @@ IF(VTK_USE_RENDERING AND VTK_USE_VIEWS)
ENDIF(VTK_USE_QT)
SET (TestsToRun ${Tests})
REMOVE (TestsToRun ${KIT}CxxTests.cxx)
LIST(REMOVE_ITEM TestsToRun ${KIT}CxxTests.cxx)
# Add all the executables
FOREACH (test ${TestsToRun})
......
......@@ -46,7 +46,7 @@ IF (VTK_USE_RENDERING AND VTK_USE_CHEMISTRY)
vtkVolumeRendering)
SET (TestsToRun ${Tests})
REMOVE (TestsToRun ${KIT}CxxTests.cxx)
LIST (REMOVE_ITEM TestsToRun ${KIT}CxxTests.cxx)
# Add all the executables
FOREACH (test ${TestsToRun})
......
......@@ -40,7 +40,7 @@ ADD_EXECUTABLE(${KIT}CxxTests ${Tests} vtkTestNewVar.cxx)
TARGET_LINK_LIBRARIES(${KIT}CxxTests vtkCommon)
SET (TestsToRun ${Tests})
REMOVE (TestsToRun ${KIT}CxxTests.cxx)
LIST (REMOVE_ITEM TestsToRun ${KIT}CxxTests.cxx)
# Configure a header needed by SystemInformation.
CONFIGURE_FILE("${VTK_SOURCE_DIR}/Common/Testing/Cxx/SystemInformation.h.in"
......@@ -107,7 +107,7 @@ IF(VTK_USE_N_WAY_ARRAYS)
TARGET_LINK_LIBRARIES(ArrayCxxTests vtkCommon)
SET(ArrayTestsToRun ${ArrayTests})
REMOVE(ArrayTestsToRun ArrayCxxTests.cxx)
LIST(REMOVE_ITEM ArrayTestsToRun ArrayCxxTests.cxx)
FOREACH(test ${ArrayTestsToRun})
GET_FILENAME_COMPONENT(TName ${test} NAME_WE)
......
......@@ -47,7 +47,7 @@ ADD_EXECUTABLE(${KIT}CxxTests ${Tests})
TARGET_LINK_LIBRARIES(${KIT}CxxTests vtkIO vtkFiltering vtkGraphics)
SET (TestsToRun ${Tests})
REMOVE (TestsToRun ${KIT}CxxTests.cxx)
LIST (REMOVE_ITEM TestsToRun ${KIT}CxxTests.cxx)
#
# Add all the executables
......
......@@ -26,7 +26,7 @@ CREATE_TEST_SOURCELIST(Tests ${KIT}CxxTests.cxx ${MyTests}
ADD_EXECUTABLE(${KIT}CxxTests ${Tests} QTestApp.cxx)
TARGET_LINK_LIBRARIES(${KIT}CxxTests QVTK)
SET (TestsToRun ${Tests})
REMOVE (TestsToRun ${KIT}CxxTests.cxx)
LIST (REMOVE_ITEM TestsToRun ${KIT}CxxTests.cxx)
#
# Add all the executables
......
......@@ -75,7 +75,7 @@ ADD_EXECUTABLE(${KIT}CxxTests ${Tests} ${Kit_SRCS} )
TARGET_LINK_LIBRARIES(${KIT}CxxTests vtkGenericFiltering vtkRendering vtkIO)
SET (TestsToRun ${Tests})
REMOVE (TestsToRun ${KIT}CxxTests.cxx)
LIST( REMOVE_ITEM TestsToRun ${KIT}CxxTests.cxx)
#
# Add all the executables
......
......@@ -24,7 +24,7 @@ IF (VTK_USE_DISPLAY)
TARGET_LINK_LIBRARIES(${KIT}CxxTests vtkGeovis vtkRendering vtkIO)
SET (TestsToRun ${Tests})
REMOVE (TestsToRun ${KIT}CxxTests.cxx)
LIST (REMOVE_ITEM TestsToRun ${KIT}CxxTests.cxx)
#
# Add all the executables
......
......@@ -126,7 +126,7 @@ IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
TARGET_LINK_LIBRARIES(${KIT}CxxTests vtkInfovis)
ENDIF (VTK_USE_GNU_R OR VTK_USE_MATLAB_MEX)
SET (TestsToRun ${Tests})
REMOVE (TestsToRun ${KIT}CxxTests.cxx)
LIST (REMOVE_ITEM TestsToRun ${KIT}CxxTests.cxx)
#
# Add all the executables
......
......@@ -46,7 +46,7 @@ ENDIF (VTK_DATA_ROOT)
# remove some tests if there is no display of if they need args
IF(NOT VTK_USE_DISPLAY)
REMOVE(MyTests
list(REMOVE_ITEM MyTests
TestAxisActor3D.cxx
TestBarChartActor.cxx
TestLegendScaleActor.cxx
......@@ -68,7 +68,7 @@ INCLUDE(${VTK_SOURCE_DIR}/Rendering/vtkTestingObjectFactory.cmake)
ADD_EXECUTABLE(${KIT}CxxTests ${Tests})
TARGET_LINK_LIBRARIES(${KIT}CxxTests vtkHybrid vtkRendering vtkImaging vtkIO )
SET (TestsToRun ${Tests})
REMOVE (TestsToRun ${KIT}CxxTests.cxx TestPolyDataSilhouette.cxx TestImageStencilData.cxx)
LIST( REMOVE_ITEM TestsToRun ${KIT}CxxTests.cxx TestPolyDataSilhouette.cxx TestImageStencilData.cxx)
#
# Add all the executables
......
......@@ -258,7 +258,7 @@ IF(VTK_USE_N_WAY_ARRAYS)
TARGET_LINK_LIBRARIES(ArrayIOCxxTests vtkIO vtkGraphics)
SET(ArrayTestsToRun ${ArrayIOTests})
REMOVE(ArrayTestsToRun ArrayIOCxxTests.cxx)
LIST(REMOVE_ITEM ArrayTestsToRun ArrayIOCxxTests.cxx)
FOREACH(test ${ArrayTestsToRun})
GET_FILENAME_COMPONENT(TName ${test} NAME_WE)
......
......@@ -18,7 +18,7 @@ IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
ADD_EXECUTABLE(${KIT}CxxTests ${Tests})
TARGET_LINK_LIBRARIES(${KIT}CxxTests vtkRendering vtkIO)
SET (TestsToRun ${Tests})
REMOVE (TestsToRun ${KIT}CxxTests.cxx)
LIST (REMOVE_ITEM TestsToRun ${KIT}CxxTests.cxx)
#
# Add all the executables
......
......@@ -209,7 +209,7 @@ IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
TARGET_LINK_LIBRARIES(${KIT}CxxTests ${LIBS})
SET (TestsToRun ${Tests})
REMOVE (TestsToRun ${KIT}CxxTests.cxx)
LIST (REMOVE_ITEM TestsToRun ${KIT}CxxTests.cxx)
#
# Add all the executables
......
......@@ -34,7 +34,7 @@ IF(VTK_USE_DISPLAY AND VTK_USE_RENDERING)
ADD_EXECUTABLE(${KIT}CxxTests ${Tests} ExerciseMultiProcessController.cxx)
TARGET_LINK_LIBRARIES(${KIT}CxxTests vtkRendering vtkIO vtkParallel vtkHybrid)
SET (TestsToRun ${Tests})
REMOVE (TestsToRun ${KIT}CxxTests.cxx TestWindBladeReader.cxx)
LIST (REMOVE_ITEM TestsToRun ${KIT}CxxTests.cxx TestWindBladeReader.cxx)
# Add all the standard tests
FOREACH (test ${TestsToRun})
......
......@@ -170,7 +170,7 @@ IF (VTK_OPENGL_HAS_OSMESA AND OSMESA_LIBRARY)
ENDIF (VTK_OPENGL_HAS_OSMESA AND OSMESA_LIBRARY)
SET (TestsToRun ${Tests})
REMOVE (TestsToRun ${KIT}CxxTests.cxx)
LIST (REMOVE_ITEM TestsToRun ${KIT}CxxTests.cxx)
#
# Add all the executables
......
......@@ -17,7 +17,7 @@ SET( LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
ADD_EXECUTABLE( freerangeTests ${freerangeTestSrcs} )
SET( TestsToRun ${freerangeTestSrcs} )
REMOVE( TestsToRun freerangeTests.cxx )
LIST( REMOVE_ITEM TestsToRun freerangeTests.cxx )
FOREACH (test ${TestsToRun})
GET_FILENAME_COMPONENT(TName ${test} NAME_WE)
......
......@@ -24,7 +24,7 @@ ADD_EXECUTABLE( ExoIICTests ${ExoIICTests} )
TARGET_LINK_LIBRARIES( ExoIICTests vtkCommon vtkexoIIc vtkNetCDF )
SET( TestsToRun ${ExoIICTests} )
REMOVE( TestsToRun ExoIICTests.cxx )
LIST( REMOVE_ITEM TestsToRun ExoIICTests.cxx )
FOREACH( test ${TestsToRun} )
GET_FILENAME_COMPONENT(TName ${test} NAME_WE)
......
......@@ -46,7 +46,7 @@ IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
ENDIF(VTK_USE_QT)
SET (TestsToRun ${Tests})
REMOVE (TestsToRun ${KIT}CxxTests.cxx)
LIST (REMOVE_ITEM TestsToRun ${KIT}CxxTests.cxx)
#
# Add all the executables
......
......@@ -58,7 +58,7 @@ IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
ADD_EXECUTABLE(${KIT}CxxTests ${Tests} ${MyTestSupport} )
TARGET_LINK_LIBRARIES(${KIT}CxxTests vtkVolumeRendering)
SET (TestsToRun ${Tests})
REMOVE (TestsToRun ${KIT}CxxTests.cxx)
LIST (REMOVE_ITEM TestsToRun ${KIT}CxxTests.cxx)
#
# Add all the executables
......
......@@ -115,7 +115,7 @@ INCLUDE(${VTK_SOURCE_DIR}/Rendering/vtkTestingObjectFactory.cmake)
ADD_EXECUTABLE(${KIT}CxxTests ${Tests})
TARGET_LINK_LIBRARIES(${KIT}CxxTests vtkWidgets)
SET (TestsToRun ${Tests})
REMOVE( TestsToRun
LIST(REMOVE_ITEM TestsToRun
${KIT}CxxTests.cxx
TestHandleWidget.cxx
TerrainPolylineEditor.cxx
......
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