diff --git a/Accelerators/Vtkm/Testing/Cxx/CMakeLists.txt b/Accelerators/Vtkm/Testing/Cxx/CMakeLists.txt index b0727f58a3f32265e75bdda7af6ed91bcc6c2da2..061d1280dc2c8e6505fd0ea2f9d62a0da602b947 100644 --- a/Accelerators/Vtkm/Testing/Cxx/CMakeLists.txt +++ b/Accelerators/Vtkm/Testing/Cxx/CMakeLists.txt @@ -1,4 +1,4 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkAcceleratorsVtkmCxxTests tests TestVTKMCleanGrid.cxx TestVTKMClip.cxx TestVTKMClipWithImplicitFunction.cxx @@ -14,6 +14,6 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests TestVTKMThreshold2.cxx TestVTKMTriangleMeshPointNormals.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests +vtk_test_cxx_executable(vtkAcceleratorsVtkmCxxTests tests RENDERING_FACTORY ) diff --git a/Charts/Core/Testing/Cxx/CMakeLists.txt b/Charts/Core/Testing/Cxx/CMakeLists.txt index 8937aa5872cb34a0caa86c6e5edb2f0af7db7c03..6413df015fe7a0a710a1be644809a27d87546987 100644 --- a/Charts/Core/Testing/Cxx/CMakeLists.txt +++ b/Charts/Core/Testing/Cxx/CMakeLists.txt @@ -36,7 +36,7 @@ set(TestParallelCoordinatesDouble_ARGS -E 15 ) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkChartsCoreCxxTests tests TestContextScene.cxx,NO_DATA,NO_VALID TestControlPointsItem.cxx,NO_DATA,NO_VALID TestControlPointsItemEvents.cxx,NO_DATA,NO_VALID @@ -101,6 +101,6 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests TestSurfacePlot.cxx TestZoomAxis.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests +vtk_test_cxx_executable(vtkChartsCoreCxxTests tests RENDERING_FACTORY ) diff --git a/Common/Color/Testing/Cxx/CMakeLists.txt b/Common/Color/Testing/Cxx/CMakeLists.txt index 3b0126355177bf44846483aa05aa9c6344c73d4a..fee06b459b8e04b18e6bc48fb1f948eb809179f5 100644 --- a/Common/Color/Testing/Cxx/CMakeLists.txt +++ b/Common/Color/Testing/Cxx/CMakeLists.txt @@ -1,7 +1,7 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkCommonColorCxxTests tests TestCategoricalColors.cxx,NO_VALID TestColorSeries.cxx TestColorSeriesLookupTables.cxx,NO_VALID TestNamedColors.cxx,NO_VALID ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkCommonColorCxxTests tests) diff --git a/Common/ComputationalGeometry/Testing/Cxx/CMakeLists.txt b/Common/ComputationalGeometry/Testing/Cxx/CMakeLists.txt index bbce0e01c1d4db94a03b43ccc481c8e2e8690f31..fb900360cd2c9254a83726f69db2f5152766d193 100644 --- a/Common/ComputationalGeometry/Testing/Cxx/CMakeLists.txt +++ b/Common/ComputationalGeometry/Testing/Cxx/CMakeLists.txt @@ -1,5 +1,5 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkCommonComputationalGeometryCxxTests tests NO_DATA NO_VALID NO_OUTPUT UnitTestParametricSpline.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkCommonComputationalGeometryCxxTests tests) diff --git a/Common/Core/Testing/Cxx/CMakeLists.txt b/Common/Core/Testing/Cxx/CMakeLists.txt index 050002e50223f7c4a5f96ab8fd09f4281a061f0f..0fb43789be086d1eed9961c476c8814f98a19199 100644 --- a/Common/Core/Testing/Cxx/CMakeLists.txt +++ b/Common/Core/Testing/Cxx/CMakeLists.txt @@ -77,7 +77,7 @@ set(TestSystemInformation_ARGS ${CMAKE_BINARY_DIR}) # Tell TestXMLFileOutputWindow where to write test file set(TestXMLFileOutputWindow_ARGS ${CMAKE_BINARY_DIR}/Testing/Temporary/XMLFileOutputWindow.txt) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkCommonCoreCxxTests tests NO_DATA NO_VALID NO_OUTPUT UnitTestMath.cxx TestArrayAPI.cxx @@ -141,6 +141,6 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests ${data_array_tests} ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests +vtk_test_cxx_executable(vtkCommonCoreCxxTests tests vtkTestNewVar.cxx ) diff --git a/Common/DataModel/Testing/Cxx/CMakeLists.txt b/Common/DataModel/Testing/Cxx/CMakeLists.txt index 3e50528dea3843669b839f697c1690048f3772b3..835d69fac605af315170119e9fae1386101619c3 100644 --- a/Common/DataModel/Testing/Cxx/CMakeLists.txt +++ b/Common/DataModel/Testing/Cxx/CMakeLists.txt @@ -1,4 +1,4 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkCommonDataModelCxxTests tests NO_DATA NO_VALID NO_OUTPUT LagrangeHexahedron.cxx TestAngularPeriodicDataArray.cxx @@ -70,7 +70,7 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests UnitTestPlanesIntersection.cxx UnitTestTriangleIntersection.cxx ) -vtk_add_test_cxx(${vtk-module}CxxTests data_tests +vtk_add_test_cxx(vtkCommonDataModelCxxTests data_tests TestLagrangeTriangle.cxx TestLagrangeTetra.cxx quadraticIntersection.cxx @@ -85,12 +85,12 @@ vtk_add_test_cxx(${vtk-module}CxxTests data_tests # add to the list but don't define a test list(APPEND data_tests TestPolyhedron2.cxx) -vtk_add_test_cxx(${vtk-module}CxxTests output_tests +vtk_add_test_cxx(vtkCommonDataModelCxxTests output_tests TestKdTreeRepresentation.cxx,NO_DATA ) ExternalData_add_test(VTKData NAME TestPolyhedron2 - COMMAND ${vtk-module}CxxTests TestPolyhedron2 + COMMAND vtkCommonDataModelCxxTests TestPolyhedron2 -D DATA{../Data/polyhedron_mesh.vtu} ) set(all_tests @@ -99,4 +99,4 @@ set(all_tests ${output_tests} ${custom_tests} ) -vtk_test_cxx_executable(${vtk-module}CxxTests all_tests) +vtk_test_cxx_executable(vtkCommonDataModelCxxTests all_tests) diff --git a/Common/ExecutionModel/Testing/Cxx/CMakeLists.txt b/Common/ExecutionModel/Testing/Cxx/CMakeLists.txt index adb9f4946ccbf98de78cfbb98dac1f33066dc777..b2bc59cd678d03f5fd6ba67f6e3a1a9959fdb7b2 100644 --- a/Common/ExecutionModel/Testing/Cxx/CMakeLists.txt +++ b/Common/ExecutionModel/Testing/Cxx/CMakeLists.txt @@ -1,4 +1,4 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkCommonExecutionModelCxxTests tests NO_DATA NO_VALID TestCopyAttributeData.cxx TestImageDataToStructuredGrid.cxx @@ -9,4 +9,4 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests TestTrivialConsumer.cxx UnitTestSimpleScalarTree.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkCommonExecutionModelCxxTests tests) diff --git a/Common/Math/Testing/Cxx/CMakeLists.txt b/Common/Math/Testing/Cxx/CMakeLists.txt index f266b96648bdf19b35afc28906ce907578cb6583..d2f9b4814612fa6eeb98be5fd9a85d0a872f4b66 100644 --- a/Common/Math/Testing/Cxx/CMakeLists.txt +++ b/Common/Math/Testing/Cxx/CMakeLists.txt @@ -1,8 +1,8 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkCommonMathCxxTests tests NO_DATA NO_VALID NO_OUTPUT TestAmoebaMinimizer.cxx TestMatrix3x3.cxx TestPolynomialSolversUnivariate.cxx TestQuaternion.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkCommonMathCxxTests tests) diff --git a/Common/Misc/Testing/Cxx/CMakeLists.txt b/Common/Misc/Testing/Cxx/CMakeLists.txt index 83910ca34b2cfc49d1f5aecb9ce7cc386de413bc..936de1718060de9fcde8a16f7545c0abb9055dfe 100644 --- a/Common/Misc/Testing/Cxx/CMakeLists.txt +++ b/Common/Misc/Testing/Cxx/CMakeLists.txt @@ -1,4 +1,4 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkCommonMiscCxxTests tests NO_DATA NO_VALID NO_OUTPUT TestPolygonBuilder.cxx TestPolygonBuilder2.cxx @@ -8,4 +8,4 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests TestPolygonBuilder5.cxx UnitTestFunctionParser.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkCommonMiscCxxTests tests) diff --git a/Common/System/Testing/Cxx/CMakeLists.txt b/Common/System/Testing/Cxx/CMakeLists.txt index bd66745fe3e3218cad69258606add41f8f99c35e..0ff58c1cba2d93e9476a8a24e8506597db4e3040 100644 --- a/Common/System/Testing/Cxx/CMakeLists.txt +++ b/Common/System/Testing/Cxx/CMakeLists.txt @@ -1,6 +1,6 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkCommonSystemCxxTests tests NO_DATA NO_VALID NO_OUTPUT TestDirectory.cxx otherTimerLog.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkCommonSystemCxxTests tests) diff --git a/Common/Transforms/Testing/Cxx/CMakeLists.txt b/Common/Transforms/Testing/Cxx/CMakeLists.txt index a3f56db0cfa6181308a959c054307cf99bdf1b92..7e33dad7dfde6320d493a212033500d1477788bc 100644 --- a/Common/Transforms/Testing/Cxx/CMakeLists.txt +++ b/Common/Transforms/Testing/Cxx/CMakeLists.txt @@ -1,6 +1,6 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkCommonTransformsCxxTests tests NO_DATA NO_VALID NO_OUTPUT TestTransform.cxx TestLandmarkTransform.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkCommonTransformsCxxTests tests) diff --git a/Domains/Chemistry/Testing/Cxx/CMakeLists.txt b/Domains/Chemistry/Testing/Cxx/CMakeLists.txt index b00ad3c2db437832d0b7feb6b20186a64931a037..0e9df8c14f9d916ccbf4dafeb84beb514a11bb40 100644 --- a/Domains/Chemistry/Testing/Cxx/CMakeLists.txt +++ b/Domains/Chemistry/Testing/Cxx/CMakeLists.txt @@ -14,7 +14,7 @@ endif() set(TestVASPAnimationReader_ARGS DATA{../Data/VASP/NPT_Z_ANIMATE.out}) set(TestVASPTessellationReader_ARGS DATA{../Data/VASP/NPT_Z_TESSELLATE.out}) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkDomainsChemistryCxxTests tests ${generator_test} TestBallAndStick.cxx TestPDBBallAndStick.cxx @@ -39,7 +39,7 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests TestVDWSpheres.cxx TestCMLMoleculeReader.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests +vtk_test_cxx_executable(vtkDomainsChemistryCxxTests tests RENDERING_FACTORY ) @@ -48,6 +48,6 @@ vtk_test_cxx_executable(${vtk-module}CxxTests tests if(NOT VTK_TEST_TIMEOUT_TestPDBBallAndStick) set(VTK_TEST_TIMEOUT_TestPDBBallAndStick 360) endif() -set_tests_properties(${vtk-module}Cxx-TestPDBBallAndStick +set_tests_properties(vtkDomainsChemistryCxx-TestPDBBallAndStick PROPERTIES TIMEOUT ${VTK_TEST_TIMEOUT_TestPDBBallAndStick} RUN_SERIAL ON) diff --git a/Domains/ChemistryOpenGL2/Testing/Cxx/CMakeLists.txt b/Domains/ChemistryOpenGL2/Testing/Cxx/CMakeLists.txt index 4e65ae80393425688bce9a670130ed8f98fba347..b8b8c984faad2b2e795e5b2aeff2056eb7b0959c 100644 --- a/Domains/ChemistryOpenGL2/Testing/Cxx/CMakeLists.txt +++ b/Domains/ChemistryOpenGL2/Testing/Cxx/CMakeLists.txt @@ -1,8 +1,8 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkDomainsChemistryOpenGL2CxxTests tests TestPDBBallAndStickShadows.cxx TestPDBBallAndStickShadowsDOFSSAA.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests +vtk_test_cxx_executable(vtkDomainsChemistryOpenGL2CxxTests tests RENDERING_FACTORY ) @@ -11,6 +11,6 @@ vtk_test_cxx_executable(${vtk-module}CxxTests tests if(NOT VTK_TEST_TIMEOUT_TestPDBBallAndStickShadows) set(VTK_TEST_TIMEOUT_TestPDBBallAndStickShadows 360) endif() -set_tests_properties(${vtk-module}Cxx-TestPDBBallAndStickShadows +set_tests_properties(vtkDomainsChemistryOpenGL2Cxx-TestPDBBallAndStickShadows PROPERTIES TIMEOUT ${VTK_TEST_TIMEOUT_TestPDBBallAndStickShadows} RUN_SERIAL ON) diff --git a/Domains/Microscopy/Testing/Cxx/CMakeLists.txt b/Domains/Microscopy/Testing/Cxx/CMakeLists.txt index 83be57b3f85091dfb7fa1065f14d6f42c44534d5..9c6ec2d63e98d4feee615153cda5c90099d7532e 100644 --- a/Domains/Microscopy/Testing/Cxx/CMakeLists.txt +++ b/Domains/Microscopy/Testing/Cxx/CMakeLists.txt @@ -1,14 +1,14 @@ # OpenSlideReader Tests -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkDomainsMicroscopyCxxTests tests TestOpenSlideReader.cxx "DATA{${VTK_TEST_INPUT_DIR}/Microscopy/small2.ndpi}" ) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkDomainsMicroscopyCxxTests tests TestOpenSlideReaderPartialTIF,TestOpenSlideReaderPartial.cxx "DATA{${VTK_TEST_INPUT_DIR}/Microscopy/pathology.tif}" ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests RENDERING_FACTORY) +vtk_test_cxx_executable(vtkDomainsMicroscopyCxxTests tests RENDERING_FACTORY) diff --git a/Filters/AMR/Testing/Cxx/CMakeLists.txt b/Filters/AMR/Testing/Cxx/CMakeLists.txt index e82179ea5b8dba84d7d8fdc3435273bd1f61d7bb..d73241be219a922434a19bb09dee85c726af1a63 100644 --- a/Filters/AMR/Testing/Cxx/CMakeLists.txt +++ b/Filters/AMR/Testing/Cxx/CMakeLists.txt @@ -10,14 +10,14 @@ foreach(test IN LISTS cxx_tests) ${test}.cxx) endforeach() -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkFiltersAMRCxxTests tests NO_VALID NO_OUTPUT ${test_files} ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkFiltersAMRCxxTests tests) foreach(test IN LISTS cxx_tests) - set_tests_properties(${vtk-module}Cxx-${test} + set_tests_properties(vtkFiltersAMRCxx-${test} PROPERTIES FAIL_REGULAR_EXPRESSION "Error" ) diff --git a/Filters/AMR/Testing/Python/CMakeLists.txt b/Filters/AMR/Testing/Python/CMakeLists.txt index 0bf4bf2ea97e9c598036b271a99ed68cc91ebfb5..e06456f3ede3c856c91b3712296605901029a1c8 100644 --- a/Filters/AMR/Testing/Python/CMakeLists.txt +++ b/Filters/AMR/Testing/Python/CMakeLists.txt @@ -14,7 +14,7 @@ if(VTK_PYTHON_EXE) ${test_files} ) foreach(test IN LISTS python_tests) - set_tests_properties(${vtk-module}Python-${test} + set_tests_properties(vtkFiltersAMRPython-${test} PROPERTIES FAIL_REGULAR_EXPRESSION "Error" ) diff --git a/Filters/Core/Testing/Cxx/CMakeLists.txt b/Filters/Core/Testing/Cxx/CMakeLists.txt index 51d1b21ec94143cd0c996de448fcca806c0d00cf..75778672f356a9db23e67dc8c47d619671fb7b4e 100644 --- a/Filters/Core/Testing/Cxx/CMakeLists.txt +++ b/Filters/Core/Testing/Cxx/CMakeLists.txt @@ -1,4 +1,4 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkFiltersCoreCxxTests tests TestAppendArcLength.cxx,NO_VALID TestAppendFilter.cxx,NO_VALID TestAppendPolyData.cxx,NO_VALID @@ -50,4 +50,4 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests UnitTestMergeFilter.cxx,NO_VALID ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkFiltersCoreCxxTests tests) diff --git a/Filters/Extraction/Testing/Cxx/CMakeLists.txt b/Filters/Extraction/Testing/Cxx/CMakeLists.txt index fdb9347ad28569c3de2ffe1b0b69c9d031a3f2f2..8a08750249c6d760b69c048a64948356030d974e 100644 --- a/Filters/Extraction/Testing/Cxx/CMakeLists.txt +++ b/Filters/Extraction/Testing/Cxx/CMakeLists.txt @@ -1,8 +1,8 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkFiltersExtractionCxxTests tests TestConvertSelection.cxx,NO_VALID TestExtractSelection.cxx TestExtraction.cxx TestExtractRectilinearGrid.cxx,NO_VALID,NO_DATA TestExtractTimeSteps.cxx,NO_VALID ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkFiltersExtractionCxxTests tests) diff --git a/Filters/FlowPaths/Testing/Cxx/CMakeLists.txt b/Filters/FlowPaths/Testing/Cxx/CMakeLists.txt index f009a4556959ef2320de6966bb854985ec45137a..9c1b7e6cccafab623b5f3f478c2f2eaf9725d5ac 100644 --- a/Filters/FlowPaths/Testing/Cxx/CMakeLists.txt +++ b/Filters/FlowPaths/Testing/Cxx/CMakeLists.txt @@ -1,4 +1,4 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkFiltersFlowPathsCxxTests tests TestBSPTree.cxx TestEvenlySpacedStreamlines2D.cxx TestStreamTracer.cxx,NO_VALID @@ -9,7 +9,7 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests TestLagrangianParticle.cxx,NO_VALID TestLagrangianParticleTracker.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests +vtk_test_cxx_executable(vtkFiltersFlowPathsCxxTests tests RENDERING_FACTORY ) ExternalData_Expand_Arguments(VTKData _ diff --git a/Filters/General/Testing/Cxx/CMakeLists.txt b/Filters/General/Testing/Cxx/CMakeLists.txt index fcd38b2d6ca0485166f6d9cc9621a34c2fe8be8b..f82fc7291333a74ccda1ebfdc86fd6c49cff5beb 100644 --- a/Filters/General/Testing/Cxx/CMakeLists.txt +++ b/Filters/General/Testing/Cxx/CMakeLists.txt @@ -2,7 +2,7 @@ set(TestDensifyPolyData_ARGS -E 15) set(TestDataSetGradient_ARGS -E 25) set(TestDataSetGradientPrecompute_ARGS -E 25) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkFiltersGeneralCxxTests tests ArrayExtractFactoredArray.cxx,NO_VALID ArrayMatricizeArray.cxx,NO_VALID ArrayNormalizeMatrixVectors.cxx,NO_VALID @@ -42,7 +42,7 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests UnitTestMultiThreshold.cxx,NO_VALID ) # Tests with data -vtk_add_test_cxx(${vtk-module}CxxTests data_tests +vtk_add_test_cxx(vtkFiltersGeneralCxxTests data_tests BoxClipPointData.cxx BoxClipOrientedPointData.cxx TestDataSetGradient.cxx @@ -58,12 +58,12 @@ set(all_tests ${data_tests} ) -vtk_test_cxx_executable(${vtk-module}CxxTests all_tests +vtk_test_cxx_executable(vtkFiltersGeneralCxxTests all_tests RENDERING_FACTORY) # On some machines this test takes some extra time if(NOT VTK_TEST_TIMEOUT_TestYoungsMaterialInterface) set(VTK_TEST_TIMEOUT_TestYoungsMaterialInterface 300) endif() -set_tests_properties(${vtk-module}Cxx-TestYoungsMaterialInterface +set_tests_properties(vtkFiltersGeneralCxx-TestYoungsMaterialInterface PROPERTIES TIMEOUT ${VTK_TEST_TIMEOUT_TestYoungsMaterialInterface}) diff --git a/Filters/Generic/Testing/Cxx/CMakeLists.txt b/Filters/Generic/Testing/Cxx/CMakeLists.txt index 576ef65564ac18510e534ece1447ddad5d0adc63..5889b3a7a92bfe5d2f07beb7552c5f8481e98d86 100644 --- a/Filters/Generic/Testing/Cxx/CMakeLists.txt +++ b/Filters/Generic/Testing/Cxx/CMakeLists.txt @@ -1,4 +1,4 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkFiltersGenericCxxTests tests TestGenericStreamTracer.cxx TestGenericClip.cxx TestGenericContourFilter.cxx @@ -11,4 +11,4 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests UnitTestGenericGeometryFilter.cxx,NO_VALID,NO_DATA ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkFiltersGenericCxxTests tests) diff --git a/Filters/Geometry/Testing/Cxx/CMakeLists.txt b/Filters/Geometry/Testing/Cxx/CMakeLists.txt index 35ad56c004f2eb11a608ec08f47847cdb475203f..abfd8ea461aff688ac9d5f4b8b406f430ce7f77d 100644 --- a/Filters/Geometry/Testing/Cxx/CMakeLists.txt +++ b/Filters/Geometry/Testing/Cxx/CMakeLists.txt @@ -1,4 +1,4 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkFiltersGeometryCxxTests tests TestExtractSurfaceNonLinearSubdivision.cxx TestDataSetSurfaceFieldData.cxx,NO_VALID TestDataSetSurfaceFilterQuadraticTetsGhostCells.cxx,NO_VALID @@ -12,7 +12,7 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests TestUnstructuredGridGeometryFilter.cxx TestUnstructuredGridGeometryFilterGhostCells.cxx,NO_VALID ) -vtk_add_test_cxx(${vtk-module}CxxTests no_data_tests +vtk_add_test_cxx(vtkFiltersGeometryCxxTests no_data_tests NO_DATA NO_VALID NO_OUTPUT TestGeometryFilterCellData.cxx TestStructuredAMRGridConnectivity.cxx @@ -26,4 +26,4 @@ set(all_tests ${tests} ${no_data_tests} ) -vtk_test_cxx_executable(${vtk-module}CxxTests all_tests) +vtk_test_cxx_executable(vtkFiltersGeometryCxxTests all_tests) diff --git a/Filters/Hybrid/Testing/Cxx/CMakeLists.txt b/Filters/Hybrid/Testing/Cxx/CMakeLists.txt index 35e9b75b3aff9f70fb9e1ae5bfaac465a1ab1d1e..ecb62f87b1908d36de16ff862929d99daa2c8352 100644 --- a/Filters/Hybrid/Testing/Cxx/CMakeLists.txt +++ b/Filters/Hybrid/Testing/Cxx/CMakeLists.txt @@ -1,4 +1,4 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkFiltersHybridCxxTests tests TemporalStatistics.cxx TestHyperTreeGridBinary2DAdaptiveDataSetSurfaceFilter.cxx TestHyperTreeGridBinary2DAdaptiveDataSetSurfaceFilterMaterial.cxx @@ -15,6 +15,6 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests TestTemporalCacheTemporal.cxx,NO_VALID TestTemporalFractal.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests +vtk_test_cxx_executable(vtkFiltersHybridCxxTests tests RENDERING_FACTORY ) diff --git a/Filters/HyperTree/Testing/Cxx/CMakeLists.txt b/Filters/HyperTree/Testing/Cxx/CMakeLists.txt index d77c252176de335063f7dda4430b95ac954b78ec..dd2a321c5ce835d7bfdd37a9e282d6928b3b36b3 100644 --- a/Filters/HyperTree/Testing/Cxx/CMakeLists.txt +++ b/Filters/HyperTree/Testing/Cxx/CMakeLists.txt @@ -78,6 +78,6 @@ if (NOT VTK_LEGACY_REMOVE) ) endif() -vtk_add_test_cxx(${vtk-module}CxxTests tests ${test_sources}) +vtk_add_test_cxx(vtkFiltersHyperTreeCxxTests tests ${test_sources}) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkFiltersHyperTreeCxxTests tests) diff --git a/Filters/Modeling/Testing/Cxx/CMakeLists.txt b/Filters/Modeling/Testing/Cxx/CMakeLists.txt index 8ddfb9bae2f625b3fdfb2777d1f12286035c59f9..1462a20666cb86ffa899cbe2859210866c301022 100644 --- a/Filters/Modeling/Testing/Cxx/CMakeLists.txt +++ b/Filters/Modeling/Testing/Cxx/CMakeLists.txt @@ -1,4 +1,4 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkFiltersModelingCxxTests tests TestButterflyScalars.cxx TestNamedColorsIntegration.cxx TestPolyDataPointSampler.cxx @@ -9,4 +9,4 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests TestVolumeOfRevolutionFilter.cxx UnitTestSubdivisionFilters.cxx,NO_DATA,NO_VALID,NO_OUTPUT ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkFiltersModelingCxxTests tests) diff --git a/Filters/OpenTurns/Testing/Cxx/CMakeLists.txt b/Filters/OpenTurns/Testing/Cxx/CMakeLists.txt index 847969d146c8f66a7c994d58a29c59e2affc7263..dfc3b624631a80f8279efee9cbdd4f5775f1a23b 100644 --- a/Filters/OpenTurns/Testing/Cxx/CMakeLists.txt +++ b/Filters/OpenTurns/Testing/Cxx/CMakeLists.txt @@ -1,10 +1,10 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkFiltersOpenTurnsCxxTests tests NO_DATA NO_VALID NO_OUTPUT TestOTDensityMap.cxx TestOTKernelSmoothing.cxx ) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkFiltersOpenTurnsCxxTests tests TestScatterPlotMatrixVehiclesDensity.cxx) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkFiltersOpenTurnsCxxTests tests) diff --git a/Filters/Parallel/Testing/Cxx/CMakeLists.txt b/Filters/Parallel/Testing/Cxx/CMakeLists.txt index 1cb82c43c348adb6fe05b1dfa1238d13b1dc3d17..d3493b4d1d2d5bb8580acd7fc8f2ef2a840864f2 100644 --- a/Filters/Parallel/Testing/Cxx/CMakeLists.txt +++ b/Filters/Parallel/Testing/Cxx/CMakeLists.txt @@ -1,10 +1,10 @@ include(vtkMPI) -vtk_add_test_cxx(${vtk-module}CxxTests testsStd +vtk_add_test_cxx(vtkFiltersParallelCxxTests testsStd TestAngularPeriodicFilter.cxx ) -vtk_add_test_mpi(${vtk-module}CxxTests-MPI tests +vtk_add_test_mpi(vtkFiltersParallelCxxTests-MPI tests TESTING_DATA DistributedData.cxx DistributedDataRenderPass.cxx @@ -13,24 +13,24 @@ vtk_add_test_mpi(${vtk-module}CxxTests-MPI tests TransmitRectilinearGrid.cxx TransmitStructuredGrid.cxx ) -vtk_add_test_mpi(${vtk-module}CxxTests-MPI no_data_tests +vtk_add_test_mpi(vtkFiltersParallelCxxTests-MPI no_data_tests ParallelResampling.cxx UnitTestPMaskPoints.cxx ) -set(${vtk-module}CxxTests-MPI_NUMPROCS 1) -vtk_add_test_mpi(${vtk-module}CxxTests-MPI data_tests_1_proc +set(vtkFiltersParallelCxxTests-MPI_NUMPROCS 1) +vtk_add_test_mpi(vtkFiltersParallelCxxTests-MPI data_tests_1_proc ParallelConnectivity1,ParallelConnectivity.cxx,TESTING_DATA,NO_VALID ) # We want 4 processes to test the vtkAggregateDataSetFilter # properly -set(${vtk-module}CxxTests-MPI_NUMPROCS 4) -vtk_add_test_mpi(${vtk-module}CxxTests-MPI no_data_tests_4_procs +set(vtkFiltersParallelCxxTests-MPI_NUMPROCS 4) +vtk_add_test_mpi(vtkFiltersParallelCxxTests-MPI no_data_tests_4_procs AggregateDataSet.cxx ) -vtk_add_test_mpi(${vtk-module}CxxTests-MPI data_tests_4_procs +vtk_add_test_mpi(vtkFiltersParallelCxxTests-MPI data_tests_4_procs ParallelConnectivity4,ParallelConnectivity.cxx,TESTING_DATA,NO_VALID ) @@ -41,5 +41,5 @@ set(all_tests ${no_data_tests_4_procs} ${data_tests_4_procs} ) -vtk_test_mpi_executable(${vtk-module}CxxTests-MPI all_tests) -vtk_test_cxx_executable(${vtk-module}CxxTests testsStd) +vtk_test_mpi_executable(vtkFiltersParallelCxxTests-MPI all_tests) +vtk_test_cxx_executable(vtkFiltersParallelCxxTests testsStd) diff --git a/Filters/Parallel/Testing/Python/CMakeLists.txt b/Filters/Parallel/Testing/Python/CMakeLists.txt index c662349352d0b7d4d7973d87218e8c7001001f3b..b7ae9f4604e20c131f8a2d95dc7f22a540ee81d3 100644 --- a/Filters/Parallel/Testing/Python/CMakeLists.txt +++ b/Filters/Parallel/Testing/Python/CMakeLists.txt @@ -6,7 +6,7 @@ vtk_add_test_python(TestImageStreamer.py) vtk_add_test_python(TestRemoveGhosts.py NO_DATA NO_OUTPUT NO_VALID NO_RT) if(TARGET pvtkpython) - add_test(NAME ${vtk-module}Python-testTransmit + add_test(NAME vtkFiltersParallelPython-testTransmit COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 4 ${MPIEXEC_PREFLAGS} $ ${CMAKE_CURRENT_SOURCE_DIR}/testTransmit.py ${VTK_MPI_POSTFLAGS}) diff --git a/Filters/ParallelDIY2/Testing/Cxx/CMakeLists.txt b/Filters/ParallelDIY2/Testing/Cxx/CMakeLists.txt index f55a17fb5458843a0bf9e9bbaa388c1116375805..8cdda1ca833bd1be4f9a6e1e53f7d4b3b7406f91 100644 --- a/Filters/ParallelDIY2/Testing/Cxx/CMakeLists.txt +++ b/Filters/ParallelDIY2/Testing/Cxx/CMakeLists.txt @@ -1,7 +1,7 @@ include(vtkMPI) -set (${vtk-module}CxxTests-MPI_NUMPROCS 2) -vtk_add_test_mpi(${vtk-module}CxxTests-MPI tests +set (vtkFiltersParallelDIY2CxxTests-MPI_NUMPROCS 2) +vtk_add_test_mpi(vtkFiltersParallelDIY2CxxTests-MPI tests TESTING_DATA TestPResampleToImage.cxx TestPResampleToImageCompositeDataSet.cxx @@ -9,4 +9,4 @@ vtk_add_test_mpi(${vtk-module}CxxTests-MPI tests TestPResampleWithDataSet2.cxx ) -vtk_test_mpi_executable(${vtk-module}CxxTests-MPI tests) +vtk_test_mpi_executable(vtkFiltersParallelDIY2CxxTests-MPI tests) diff --git a/Filters/ParallelFlowPaths/Testing/Cxx/CMakeLists.txt b/Filters/ParallelFlowPaths/Testing/Cxx/CMakeLists.txt index 78f9115a49bb8b2dc85d4c649b6d939e64044f5f..f0a3de8444cc356142d6a854c3d9ca164d73ae18 100644 --- a/Filters/ParallelFlowPaths/Testing/Cxx/CMakeLists.txt +++ b/Filters/ParallelFlowPaths/Testing/Cxx/CMakeLists.txt @@ -5,12 +5,12 @@ set(TestPStream_NUMPROCS 2) set(TestPStreamGeometry_NUMPROCS 4) set(TestPParticleTracers_NUMPROCS 2) set(TestPStreamAMR_NUMPROCS 4) -vtk_add_test_mpi(${vtk-module}CxxTests-MPI tests +vtk_add_test_mpi(vtkFiltersParallelFlowPathsCxxTests-MPI tests TestPLagrangianParticleTracker.cxx,TESTING_DATA TestPStream.cxx,TESTING_DATA TestPStreamGeometry.cxx TestPParticleTracers.cxx TestPStreamAMR.cxx,TESTING_DATA,NO_VALID ) -vtk_test_mpi_executable(${vtk-module}CxxTests-MPI tests +vtk_test_mpi_executable(vtkFiltersParallelFlowPathsCxxTests-MPI tests TestVectorFieldSource.cxx) diff --git a/Filters/ParallelGeometry/Testing/Cxx/CMakeLists.txt b/Filters/ParallelGeometry/Testing/Cxx/CMakeLists.txt index fa323af0072f7f09f801447b308704564b928d11..e42e1898012fc4d487ed5d6567230807943c9125 100644 --- a/Filters/ParallelGeometry/Testing/Cxx/CMakeLists.txt +++ b/Filters/ParallelGeometry/Testing/Cxx/CMakeLists.txt @@ -8,7 +8,7 @@ set(Tests_SRCS set(TestPUnstructuredGridGhostCellsGenerator_NUMPROCS 4) -vtk_add_test_mpi(${vtk-module}CxxTests-MPI tests ${Tests_SRCS}) +vtk_add_test_mpi(vtkFiltersParallelGeometryCxxTests-MPI tests ${Tests_SRCS}) -vtk_test_mpi_executable(${vtk-module}CxxTests-MPI tests +vtk_test_mpi_executable(vtkFiltersParallelGeometryCxxTests-MPI tests UnstructuredGhostZonesCommon.cxx) diff --git a/Filters/ParallelMPI/Testing/Cxx/CMakeLists.txt b/Filters/ParallelMPI/Testing/Cxx/CMakeLists.txt index d7df8409a6f7ea3ab6b7e028108e1e0786d701ad..fd2c8a840a938f72e126f938d9cc887a0dce3917 100644 --- a/Filters/ParallelMPI/Testing/Cxx/CMakeLists.txt +++ b/Filters/ParallelMPI/Testing/Cxx/CMakeLists.txt @@ -1,6 +1,6 @@ include(vtkMPI) -vtk_add_test_mpi(${vtk-module}CxxTests-MPI tests +vtk_add_test_mpi(vtkFiltersParallelMPICxxTests-MPI tests TestImplicitConnectivity.cxx ) -vtk_test_mpi_executable(${vtk-module}CxxTests-MPI tests) +vtk_test_mpi_executable(vtkFiltersParallelMPICxxTests-MPI tests) diff --git a/Filters/ParallelStatistics/Testing/Cxx/CMakeLists.txt b/Filters/ParallelStatistics/Testing/Cxx/CMakeLists.txt index 152890d4d2387506591fab1a69fe4f8276a0b02b..039bd3f1024c6f276bcc2270208ed918d4984768 100644 --- a/Filters/ParallelStatistics/Testing/Cxx/CMakeLists.txt +++ b/Filters/ParallelStatistics/Testing/Cxx/CMakeLists.txt @@ -1,6 +1,6 @@ include(vtkMPI) -vtk_add_test_mpi(${vtk-module}CxxTests-MPI tests +vtk_add_test_mpi(vtkFiltersParallelStatisticsCxxTests-MPI tests TestRandomPContingencyStatisticsMPI.cxx TestRandomPKMeansStatisticsMPI.cxx TestRandomPMomentStatisticsMPI.cxx @@ -9,4 +9,4 @@ vtk_add_test_mpi(${vtk-module}CxxTests-MPI tests # # vtk. Why is that so? # TestRealDataPDescriptiveStatisticsMPI.cxx ) -vtk_test_mpi_executable(${vtk-module}CxxTests-MPI tests) +vtk_test_mpi_executable(vtkFiltersParallelStatisticsCxxTests-MPI tests) diff --git a/Filters/ParallelVerdict/Testing/Cxx/CMakeLists.txt b/Filters/ParallelVerdict/Testing/Cxx/CMakeLists.txt index a219aad0e9eed8551cc2c2e0cf5576e47fdcc311..043106d601b060c27bd3a7c12a2f7a5fbfb6b15e 100644 --- a/Filters/ParallelVerdict/Testing/Cxx/CMakeLists.txt +++ b/Filters/ParallelVerdict/Testing/Cxx/CMakeLists.txt @@ -1,7 +1,7 @@ include(vtkMPI) set(PCellSizeFilter_NUMPROCS 2) -vtk_add_test_mpi(${vtk-module}CxxTests-MPI tests PCellSizeFilter.cxx,TESTING_DATA,NO_VALID) +vtk_add_test_mpi(vtkFiltersParallelVerdictCxxTests-MPI tests PCellSizeFilter.cxx,TESTING_DATA,NO_VALID) -vtk_test_mpi_executable(${vtk-module}CxxTests-MPI tests +vtk_test_mpi_executable(vtkFiltersParallelVerdictCxxTests-MPI tests PCellSizeFilter.cxx) diff --git a/Filters/Points/Testing/Cxx/CMakeLists.txt b/Filters/Points/Testing/Cxx/CMakeLists.txt index f5cb3e3a975dd338196e72941990905fc26571d9..44950756708b575e0b410b95dec3e7c2254686e1 100644 --- a/Filters/Points/Testing/Cxx/CMakeLists.txt +++ b/Filters/Points/Testing/Cxx/CMakeLists.txt @@ -1,9 +1,9 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkFiltersPointsCxxTests tests UnitTestKernels.cxx,NO_VALID TestSPHKernels.cxx,NO_VALID PlotSPHKernels.cxx TestPointCloudFilterArrays.cxx,NO_VALID,NO_DATA ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests +vtk_test_cxx_executable(vtkFiltersPointsCxxTests tests RENDERING_FACTORY ) diff --git a/Filters/Programmable/Testing/Cxx/CMakeLists.txt b/Filters/Programmable/Testing/Cxx/CMakeLists.txt index 460bed6bfc9da2d3a19abaa5240c065f6b05bc31..3d1f34a08d71639526fcb3910c78cfba74e0a9cb 100644 --- a/Filters/Programmable/Testing/Cxx/CMakeLists.txt +++ b/Filters/Programmable/Testing/Cxx/CMakeLists.txt @@ -1,6 +1,6 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkFiltersProgrammableCxxTests tests TestProgrammableFilter.cxx,NO_VALID TestProgrammableGlyph.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests +vtk_test_cxx_executable(vtkFiltersProgrammableCxxTests tests RENDERING_FACTORY) diff --git a/Filters/ReebGraph/Testing/Cxx/CMakeLists.txt b/Filters/ReebGraph/Testing/Cxx/CMakeLists.txt index 2e55ff308a10b03fe0237e27f55e61c030d47da4..f6f10814ed61c93d1f450f135d4b5abc24484180 100644 --- a/Filters/ReebGraph/Testing/Cxx/CMakeLists.txt +++ b/Filters/ReebGraph/Testing/Cxx/CMakeLists.txt @@ -1,5 +1,5 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkFiltersReebGraphCxxTests tests NO_DATA NO_VALID NO_OUTPUT TestReebGraph.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkFiltersReebGraphCxxTests tests) diff --git a/Filters/SMP/Testing/Cxx/CMakeLists.txt b/Filters/SMP/Testing/Cxx/CMakeLists.txt index c531b9481deef881f2c290a2cf322f201a82560c..92fcb8dfc83a3d733b6354c50bb70b8338a0ebcb 100644 --- a/Filters/SMP/Testing/Cxx/CMakeLists.txt +++ b/Filters/SMP/Testing/Cxx/CMakeLists.txt @@ -1,9 +1,9 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkFiltersSMPCxxTests tests NO_VALID TestSMPContour.cxx ) if (NOT VTK_LEGACY_REMOVE) - vtk_add_test_cxx(${vtk-module}CxxTests tests + vtk_add_test_cxx(vtkFiltersSMPCxxTests tests NO_VALID TestThreadedSynchronizedTemplates3D.cxx TestThreadedSynchronizedTemplatesCutter3D.cxx @@ -11,4 +11,4 @@ if (NOT VTK_LEGACY_REMOVE) TestSMPWarp.cxx ) endif() -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkFiltersSMPCxxTests tests) diff --git a/Filters/Selection/Testing/Cxx/CMakeLists.txt b/Filters/Selection/Testing/Cxx/CMakeLists.txt index 63f49829177aa727062e6a81fdc454012dfbdac3..97a3808ef012a9167adc8e2f49aba7f51ab1915d 100644 --- a/Filters/Selection/Testing/Cxx/CMakeLists.txt +++ b/Filters/Selection/Testing/Cxx/CMakeLists.txt @@ -1,10 +1,10 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkFiltersSelectionCxxTests tests NO_VALID TestLinearSelector2D.cxx TestCellDistanceSelector2D.cxx TestCellDistanceSelector3D.cxx TestLinearSelector3D.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests +vtk_test_cxx_executable(vtkFiltersSelectionCxxTests tests RENDERING_FACTORY ) diff --git a/Filters/Sources/Testing/Cxx/CMakeLists.txt b/Filters/Sources/Testing/Cxx/CMakeLists.txt index 058ab7ea33aaa7ec891d34e443c9d8c2b12ff210..fd5c46f055e4b85b4de142c0c800626441096f6e 100644 --- a/Filters/Sources/Testing/Cxx/CMakeLists.txt +++ b/Filters/Sources/Testing/Cxx/CMakeLists.txt @@ -1,4 +1,4 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkFiltersSourcesCxxTests tests TestArcSource.cxx,NO_VALID TestCellTypeSource.cxx,NO_VALID TestConeSource.cxx,NO_VALID @@ -28,5 +28,5 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests TestTexturedSphereSource.cxx,NO_VALID TestGlyphSource2DResolution.cxx, ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests +vtk_test_cxx_executable(vtkFiltersSourcesCxxTests tests RENDERING_FACTORY) diff --git a/Filters/Statistics/Testing/Cxx/CMakeLists.txt b/Filters/Statistics/Testing/Cxx/CMakeLists.txt index 64d700bbe79e48c6fef3b6944911ab49b5711192..f3f09e2561329f12101993b90022add9eb1e6b2b 100644 --- a/Filters/Statistics/Testing/Cxx/CMakeLists.txt +++ b/Filters/Statistics/Testing/Cxx/CMakeLists.txt @@ -1,4 +1,4 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkFiltersStatisticsCxxTests tests NO_DATA NO_VALID NO_OUTPUT TestAutoCorrelativeStatistics.cxx TestComputeQuartiles.cxx @@ -12,4 +12,4 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests TestOrderStatistics.cxx TestPCAStatistics.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkFiltersStatisticsCxxTests tests) diff --git a/Filters/Topology/Testing/Cxx/CMakeLists.txt b/Filters/Topology/Testing/Cxx/CMakeLists.txt index 5e542b6de11047c8dc40137b20941fab6db076a9..ebd6be3ec508d576974dd77a468bd725a884a5f9 100644 --- a/Filters/Topology/Testing/Cxx/CMakeLists.txt +++ b/Filters/Topology/Testing/Cxx/CMakeLists.txt @@ -1,4 +1,4 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkFiltersTopologyCxxTests tests TestFiberSurface.cxx,NO_VALID ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkFiltersTopologyCxxTests tests) diff --git a/Filters/Verdict/Testing/Cxx/CMakeLists.txt b/Filters/Verdict/Testing/Cxx/CMakeLists.txt index 09d0f1564edfa18e8d8952e41b9ac2720d92674d..0f24368b2ed787ae02db86e4dd0c0db513427241 100644 --- a/Filters/Verdict/Testing/Cxx/CMakeLists.txt +++ b/Filters/Verdict/Testing/Cxx/CMakeLists.txt @@ -1,6 +1,6 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkFiltersVerdictCxxTests tests NO_VALID CellSizeFilter.cxx MeshQuality.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkFiltersVerdictCxxTests tests) diff --git a/GUISupport/Qt/Testing/Cxx/CMakeLists.txt b/GUISupport/Qt/Testing/Cxx/CMakeLists.txt index 9fd546d13420582ddc942d5aeaeff99427532d7c..dd025c70c6b103b3a28ece409fbc893e5a786db9 100644 --- a/GUISupport/Qt/Testing/Cxx/CMakeLists.txt +++ b/GUISupport/Qt/Testing/Cxx/CMakeLists.txt @@ -1,6 +1,6 @@ include(vtkQt) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkGUISupportQtCxxTests tests NO_VALID TestQtDebugLeaksView.cxx TestQtTableModelAdapter.cxx @@ -9,7 +9,7 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests TestQtSwapWindows.cxx ) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkGUISupportQtCxxTests tests TestQVTKOpenGLWidget.cxx TestQVTKOpenGLWidgetWithDisabledInteractor.cxx TestQVTKOpenGLWidgetWithMSAA.cxx @@ -18,7 +18,7 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests if(NOT VTK_LEGACY_REMOVE) # tests use legacy QVTKWidget. if(WIN32) - vtk_add_test_cxx(${vtk-module}CxxTests tests + vtk_add_test_cxx(vtkGUISupportQtCxxTests tests NO_VALID TestWin32QVTKWidget.cxx) endif() @@ -28,8 +28,8 @@ find_package(Qt5 COMPONENTS Widgets REQUIRED) include_directories(${Qt5Widgets_INCLUDE_DIRS}) add_definitions(${Qt5Widgets_DEFINITIONS}) -vtk_test_cxx_executable(${vtk-module}CxxTests tests +vtk_test_cxx_executable(vtkGUISupportQtCxxTests tests QTestApp.cxx) -set_target_properties(${vtk-module}CxxTests PROPERTIES +set_target_properties(vtkGUISupportQtCxxTests PROPERTIES COMPILE_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") diff --git a/GUISupport/QtOpenGL/Testing/Cxx/CMakeLists.txt b/GUISupport/QtOpenGL/Testing/Cxx/CMakeLists.txt index a5fe5fb796be8a7adcc34cc3912fa9b9b64211e1..2b1ba851ae10bfd99b1380cfe78d14a19b8816fe 100644 --- a/GUISupport/QtOpenGL/Testing/Cxx/CMakeLists.txt +++ b/GUISupport/QtOpenGL/Testing/Cxx/CMakeLists.txt @@ -1,13 +1,13 @@ if(NOT VTK_LEGACY_REMOVE) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkGUISupportQtOpenGLCxxTests tests TestQVTKWidget2.cxx,NO_DATA ) find_package(Qt5 COMPONENTS Core Gui Widgets REQUIRED QUIET) qt5_wrap_cpp(moc_srcs QTestMainWindow.h) -vtk_test_cxx_executable(${vtk-module}CxxTests tests +vtk_test_cxx_executable(vtkGUISupportQtOpenGLCxxTests tests QTestMainWindow.cxx ${moc_srcs}) -target_link_libraries(${vtk-module}CxxTests LINK_PRIVATE +target_link_libraries(vtkGUISupportQtOpenGLCxxTests LINK_PRIVATE ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${QT_QTWIDGETS_LIBRARY}) diff --git a/GUISupport/QtSQL/Testing/Cxx/CMakeLists.txt b/GUISupport/QtSQL/Testing/Cxx/CMakeLists.txt index 8637b4ec27b3d5241d11910fa5d83a27e760c122..a046f6fe32e89f42c4b0d96eb5b7f7f02fbdb481 100644 --- a/GUISupport/QtSQL/Testing/Cxx/CMakeLists.txt +++ b/GUISupport/QtSQL/Testing/Cxx/CMakeLists.txt @@ -1,6 +1,6 @@ include(vtkQt) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkGUISupportQtSQLCxxTests tests NO_VALID TestQtSQLDatabase.cxx ) @@ -9,7 +9,7 @@ find_package(Qt5 COMPONENTS Widgets REQUIRED) include_directories(${Qt5Widgets_INCLUDE_DIRS}) add_definitions(${Qt5Widgets_DEFINITIONS}) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkGUISupportQtSQLCxxTests tests) -set_target_properties(${vtk-module}CxxTests PROPERTIES +set_target_properties(vtkGUISupportQtSQLCxxTests PROPERTIES COMPILE_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") diff --git a/Geovis/Core/Testing/Cxx/CMakeLists.txt b/Geovis/Core/Testing/Cxx/CMakeLists.txt index 8a604b7cc2c3893416e136865a04eb8a80440ae0..5990cf5f7ff67d4303b6a3c7fdfc2855aaa5bc75 100644 --- a/Geovis/Core/Testing/Cxx/CMakeLists.txt +++ b/Geovis/Core/Testing/Cxx/CMakeLists.txt @@ -1,4 +1,4 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkGeovisCoreCxxTests tests TestGeoAssignCoordinates.cxx TestGeoGraticule.cxx TestGeoProjection.cxx,NO_VALID @@ -6,10 +6,10 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests ) if(NOT VTK_REPLACE_OPENGL_OVERRIDES) - vtk_add_test_cxx(${vtk-module}CxxTests tests + vtk_add_test_cxx(vtkGeovisCoreCxxTests tests TestCoincidentGeoGraphRepresentation2D.cxx TestLabeledGeoView2D.cxx ) endif() -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkGeovisCoreCxxTests tests) diff --git a/IO/ADIOS/Testing/Cxx/CMakeLists.txt b/IO/ADIOS/Testing/Cxx/CMakeLists.txt index 6a14b946a5b65de11a69fd9704327ec8ace8bbf0..62adae2d62ba36d3d0b7ecca657276363fef30ae 100644 --- a/IO/ADIOS/Testing/Cxx/CMakeLists.txt +++ b/IO/ADIOS/Testing/Cxx/CMakeLists.txt @@ -1,11 +1,11 @@ find_package(ADIOS REQUIRED) include_directories(SYSTEM ${ADIOS_INCLUDE_DIRS}) -vtk_add_test_mpi(${vtk-module}Cxx-MPI tests +vtk_add_test_mpi(vtkIOADIOSCxx-MPI tests NO_DATA NO_VALID NO_OUTPUT # Basic Create-write-read test TestADIOSSphereWR.cxx ) -vtk_test_mpi_executable(${vtk-module}Cxx-MPI tests) +vtk_test_mpi_executable(vtkIOADIOSCxx-MPI tests) diff --git a/IO/AMR/Testing/Cxx/CMakeLists.txt b/IO/AMR/Testing/Cxx/CMakeLists.txt index 330f162278e8e550fe9058585add084e1795d137..50265589446b6dd8e2da333092067f3a5816eb66 100644 --- a/IO/AMR/Testing/Cxx/CMakeLists.txt +++ b/IO/AMR/Testing/Cxx/CMakeLists.txt @@ -1,6 +1,6 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOAMRCxxTests tests NO_VALID NO_OUTPUT # TestFlashReader.cxx there is not data for this test TestEnzoReader.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkIOAMRCxxTests tests) diff --git a/IO/Core/Testing/Cxx/CMakeLists.txt b/IO/Core/Testing/Cxx/CMakeLists.txt index ecfa8092dfb221082e87aec75d708c8e2a981d0b..2683feb25da9e08e60bbc63a46e311ff9fc51cfe 100644 --- a/IO/Core/Testing/Cxx/CMakeLists.txt +++ b/IO/Core/Testing/Cxx/CMakeLists.txt @@ -1,4 +1,4 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOCoreCxxTests tests NO_VALID TestArrayDataWriter.cxx TestArrayDenormalized.cxx @@ -6,4 +6,4 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests TestCompressLZ4.cxx TestCompressZLib.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkIOCoreCxxTests tests) diff --git a/IO/Exodus/Testing/Cxx/CMakeLists.txt b/IO/Exodus/Testing/Cxx/CMakeLists.txt index 1df040962dc3d32db5f3426574c86d5ecacebd2e..29226fd69d81e3232c80eab6a26c4641556ab37f 100644 --- a/IO/Exodus/Testing/Cxx/CMakeLists.txt +++ b/IO/Exodus/Testing/Cxx/CMakeLists.txt @@ -15,10 +15,10 @@ if(VTK_DISPATCH_TYPED_ARRAYS) ) endif() -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOExodusCxxTests tests TestExodusAttributes.cxx,NO_VALID,NO_OUTPUT TestExodusSideSets.cxx,NO_VALID,NO_OUTPUT ${extra_tests} ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests +vtk_test_cxx_executable(vtkIOExodusCxxTests tests RENDERING_FACTORY) diff --git a/IO/Export/Testing/Cxx/CMakeLists.txt b/IO/Export/Testing/Cxx/CMakeLists.txt index 83a41e3552a28dcf3c884ab3d631f12fce5fd889..9bf552fd27c98df1ff74cd942ffcb9e3d69182d6 100644 --- a/IO/Export/Testing/Cxx/CMakeLists.txt +++ b/IO/Export/Testing/Cxx/CMakeLists.txt @@ -39,14 +39,14 @@ if(VTK_GHOSTSCRIPT_EXECUTABLE) ) endif() -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOExportCxxTests tests X3DTest.cxx,NO_DATA,NO_VALID TestOBJExporter.cxx,NO_DATA,NO_VALID ${GL2PSTests} ${GL2PSTestsPDF} ${PDFTests} ${SVGTests} TestRIBExporter.cxx,NO_VALID UnitTestRIB.cxx,NO_DATA,NO_VALID ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests +vtk_test_cxx_executable(vtkIOExportCxxTests tests RENDERING_FACTORY ) @@ -60,39 +60,39 @@ mark_as_advanced(RMANTREE) # Tests to run if Renderman is present if(RMANTREE) # write a Renderman ini file to specify the shaderpath - write_file(${${vtk-module}_BINARY_DIR}/Testing/Cxx/rendermn.ini - "/shaderpath &:${${vtk-module}_SOURCE_DIR}/Testing/Cxx") - add_test(NAME ${vtk-module}-RIBExporterShaderCompile + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/rendermn.ini + "/shaderpath &:${CMAKE_CURRENT_SOURCE_DIR}/Testing/Cxx") + add_test(NAME vtkIOExport-RIBExporterShaderCompile COMMAND ${RMANTREE}/bin/shader - ${${vtk-module}_SOURCE_DIR}/Testing/Data/Input/bozo.sl - ${${vtk-module}_SOURCE_DIR}/Testing/Data/Input/dented.sl - WORKING_DIRECTORY ${${vtk-module}_BINARY_DIR}/Testing/Cxx + ${CMAKE_CURRENT_SOURCE_DIR}/../Data/Input/bozo.sl + ${CMAKE_CURRENT_SOURCE_DIR}/../Data/Input/dented.sl + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) - add_test(NAME ${vtk-module}-RIBExporterPrman + add_test(NAME vtkIOExport-RIBExporterPrman COMMAND ${RMANTREE}/bin/prman ${VTK_TEST_OUTPUT_DIR}/TestRIBExporter.rib - WORKING_DIRECTORY ${${vtk-module}_BINARY_DIR}/Testing/Cxx + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) # Image diff rman generated tif with baseline - set(baseline_dir ${${vtk-module}_SOURCE_DIR}/Testing/Data/Baseline) + set(baseline_dir ${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline) ExternalData_add_test(VTKData - NAME ${vtk-module}Cxx-ComparePrmanImage + NAME vtkIOExportCxx-ComparePrmanImage COMMAND ${RMANTREE}/bin/cmptiff -d 100 DATA{${baseline_dir}/TestRIBExporter.tif} ${VTK_TEST_OUTPUT_DIR}/TestRIBExporter.tif ) - set_tests_properties(${vtk-module}-RIBExporterPrman + set_tests_properties(vtkIOExport-RIBExporterPrman PROPERTIES DEPENDS - "${vtk-module}-TestRIBExporter" + "vtkIOExport-TestRIBExporter" DEPENDS - "${vtk-module}-RIBExporterShaderCompile" + "vtkIOExport-RIBExporterShaderCompile" ENVIRONMENT "RMANTREE=${RMANTREE}" ) - set_tests_properties("${vtk-module}Cxx-ComparePrmanImage" + set_tests_properties("vtkIOExportCxx-ComparePrmanImage" PROPERTIES - DEPENDS "${vtk-module}Cxx-TestRIBExporter" + DEPENDS "vtkIOExportCxx-TestRIBExporter" REQUIRED_FILES "${VTK_TEST_OUTPUT_DIR}/TestRIBExporter.tif" ) diff --git a/IO/ExportOpenGL2/Testing/Cxx/CMakeLists.txt b/IO/ExportOpenGL2/Testing/Cxx/CMakeLists.txt index f571553af7d32d089b3d5bb0420dce050a8b38a3..518fbc340639994a79c6db9b8f196317fac82d84 100644 --- a/IO/ExportOpenGL2/Testing/Cxx/CMakeLists.txt +++ b/IO/ExportOpenGL2/Testing/Cxx/CMakeLists.txt @@ -9,9 +9,9 @@ if(VTK_GHOSTSCRIPT_EXECUTABLE) ) endif() -vtk_add_test_cxx(${vtk-module}CxxTests tests ${GL2PSTests}) +vtk_add_test_cxx(vtkIOExportOpenGL2CxxTests tests ${GL2PSTests}) # Create rasterize/verify tests to check generated postscript: vtk_add_gl2ps_test_cxx(${GL2PSTests}) -vtk_test_cxx_executable(${vtk-module}CxxTests tests RENDERING_FACTORY) +vtk_test_cxx_executable(vtkIOExportOpenGL2CxxTests tests RENDERING_FACTORY) diff --git a/IO/FFMPEG/Testing/Cxx/CMakeLists.txt b/IO/FFMPEG/Testing/Cxx/CMakeLists.txt index 583e75402243cc7f9a3de38e768a93cd3de063c3..a6a1013207d6dd9a280a2037ff111dd1621d9eb3 100644 --- a/IO/FFMPEG/Testing/Cxx/CMakeLists.txt +++ b/IO/FFMPEG/Testing/Cxx/CMakeLists.txt @@ -1,5 +1,5 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOFFMPEGCxxTests tests NO_VALID TestFFMPEGWriter.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkIOFFMPEGCxxTests tests) diff --git a/IO/GDAL/Testing/Cxx/CMakeLists.txt b/IO/GDAL/Testing/Cxx/CMakeLists.txt index 03691ce4253f8b3661cbe2844c3900e997d9c98a..0530e24762cc49081364a684b68547121f7f25b9 100644 --- a/IO/GDAL/Testing/Cxx/CMakeLists.txt +++ b/IO/GDAL/Testing/Cxx/CMakeLists.txt @@ -5,10 +5,10 @@ set(TestGDALRasterPalette_ARGS -D DATA{../Data/Input/TestGDALRasterPalette.tif} ) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOGDALCxxTests tests TestGDALVectorReader.cxx TestGDALRasterReader.cxx TestGDALRasterNoDataValue.cxx,NO_VALID,NO_OUTPUT TestGDALRasterPalette.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkIOGDALCxxTests tests) diff --git a/IO/Geometry/Testing/Cxx/CMakeLists.txt b/IO/Geometry/Testing/Cxx/CMakeLists.txt index df02bde592656df4333d34fe5e1df404f6029ac3..ebe9a4a450acf8011ede15e3379ded234e80a931 100644 --- a/IO/Geometry/Testing/Cxx/CMakeLists.txt +++ b/IO/Geometry/Testing/Cxx/CMakeLists.txt @@ -21,7 +21,7 @@ ExternalData_Expand_Arguments(VTKData _ "DATA{${VTK_TEST_INPUT_DIR}/OpenFOAM/64BitFloats/constant/polyMesh/,REGEX:.*}" "DATA{${VTK_TEST_INPUT_DIR}/OpenFOAM/64BitFloats/system/,REGEX:.*}" ) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOGeometryCxxTests tests TestDataObjectIO.cxx,NO_VALID TestIncrementalOctreePointLocator.cxx,NO_VALID UnstructuredGridCellGradients.cxx @@ -42,25 +42,25 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests UnitTestSTLWriter.cxx,NO_VALID ) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOGeometryCxxTests tests TestSTLReaderSinglePatch,TestSTLReader.cxx DATA{${VTK_TEST_INPUT_DIR}/42400-IDGH.stl} ) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOGeometryCxxTests tests TestSTLReaderMultiplePatches,TestSTLReader.cxx DATA{${VTK_TEST_INPUT_DIR}/multiple_patches.stl} ) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOGeometryCxxTests tests TestPTSReader,TestPTSReader.cxx DATA{${VTK_TEST_INPUT_DIR}/samplePTS.pts} ) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOGeometryCxxTests tests TestAVSucdReaderContiguousASCII,TestAVSucdReader.cxx DATA{${VTK_TEST_INPUT_DIR}/cellsnd.ascii.inp} ) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOGeometryCxxTests tests TestAVSucdReaderNonContiguousASCII,TestAVSucdReader.cxx DATA{${VTK_TEST_INPUT_DIR}/cellsnd.noncontiguous.ascii.inp} ) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOGeometryCxxTests tests TestAVSucdReaderBinary,TestAVSucdReader.cxx DATA{${VTK_TEST_INPUT_DIR}/cellsnd.bin.inp} ) @@ -79,7 +79,7 @@ if(VTK_USE_LARGE_DATA AND _known_little_endian) "DATA{${VTK_TEST_INPUT_DIR}/MFIXReader/,REGEX:.*}" ) - vtk_add_test_cxx(${vtk-module}CxxTests large_data_tests + vtk_add_test_cxx(vtkIOGeometryCxxTests large_data_tests TestWindBladeReader.cxx TestMFIXReader.cxx,NO_VALID ) @@ -88,4 +88,4 @@ if(VTK_USE_LARGE_DATA AND _known_little_endian) ) endif() -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkIOGeometryCxxTests tests) diff --git a/IO/Image/Testing/Cxx/CMakeLists.txt b/IO/Image/Testing/Cxx/CMakeLists.txt index 0445c0b467bedaacb4e67057a4fd2616cfb32fae..9a06be3e680afb8e89bb14f0cbe38a3aac9be9ff 100644 --- a/IO/Image/Testing/Cxx/CMakeLists.txt +++ b/IO/Image/Testing/Cxx/CMakeLists.txt @@ -3,7 +3,7 @@ "DATA{${VTK_TEST_INPUT_DIR}/dicom/collection/,REGEX:.*}" ) -vtk_add_test_cxx(${vtk-module}CxxTests data_tests +vtk_add_test_cxx(vtkIOImageCxxTests data_tests # TestImageReader2Factory.cxx # fixme (deps not satisfied) TestNrrdReader.cxx TestNIFTIReaderWriter.cxx @@ -11,7 +11,7 @@ vtk_add_test_cxx(${vtk-module}CxxTests data_tests TestNIFTI2.cxx ) set(TestMetaIO_ARGS "DATA{${VTK_TEST_INPUT_DIR}/HeadMRVolume.mhd,HeadMRVolume.raw}") -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOImageCxxTests tests NO_DATA NO_VALID NO_OUTPUT TestDataObjectIO.cxx TestMetaIO.cxx @@ -19,68 +19,68 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests ) # Each of these must be added in a separate vtk_add_test_cxx -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOImageCxxTests tests TestJPEGReader.cxx,NO_OUTPUT "DATA{${VTK_TEST_INPUT_DIR}/beach.jpg}") -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOImageCxxTests tests TestDICOMImageReader.cxx,NO_OUTPUT "DATA{${VTK_TEST_INPUT_DIR}/dicom/prostate.IMG}") -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOImageCxxTests tests TestDICOMImageReaderFileCollection.cxx,NO_OUTPUT "collection") -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOImageCxxTests tests TestBMPReader.cxx,NO_OUTPUT "DATA{${VTK_TEST_INPUT_DIR}/masonry.bmp}") -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOImageCxxTests tests TestBMPReaderDoNotAllow8BitBMP.cxx,NO_OUTPUT "DATA{${VTK_TEST_INPUT_DIR}/masonry.bmp}") -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOImageCxxTests tests TestTIFFReaderMultipleMulti,TestTIFFReaderMultiple.cxx,NO_VALID,NO_OUTPUT "DATA{${VTK_TEST_INPUT_DIR}/libtiff/multipage_tiff_example.tif}") -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOImageCxxTests tests TestTIFFReaderMultipleNormal,TestTIFFReaderMultiple.cxx,NO_VALID,NO_OUTPUT "DATA{${VTK_TEST_INPUT_DIR}/libtiff/test.tif}") -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOImageCxxTests tests TestTIFFReaderMultipleTiled,TestTIFFReaderMultiple.cxx,NO_VALID,NO_OUTPUT "DATA{${VTK_TEST_INPUT_DIR}/libtiff/tiled_10x30_tiff_example.tif}") -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOImageCxxTests tests TestTIFFReaderMulti,TestTIFFReader.cxx,NO_OUTPUT "DATA{${VTK_TEST_INPUT_DIR}/libtiff/multipage_tiff_example.tif}") -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOImageCxxTests tests TestTIFFReaderTiled,TestTIFFReader.cxx,NO_OUTPUT "DATA{${VTK_TEST_INPUT_DIR}/libtiff/tiled_64x64_tiff_example.tif}") -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOImageCxxTests tests TestTIFFReaderTiledRGB,TestTIFFReader.cxx,NO_OUTPUT "DATA{${VTK_TEST_INPUT_DIR}/libtiff/gourds_tiled_200x300.tif}") -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOImageCxxTests tests TestCompressedTIFFReader,TestCompressedTIFFReader.cxx,NO_OUTPUT "DATA{${VTK_TEST_INPUT_DIR}/al_foam_smallest.0.tif}") -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOImageCxxTests tests TestWriteToMemoryPNG,TestWriteToMemory.cxx,NO_DATA NO_VALID NO_OUTPUT "test.png") -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOImageCxxTests tests TestWriteToMemoryJPEG,TestWriteToMemory.cxx,NO_DATA NO_VALID NO_OUTPUT "test.jpeg") -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOImageCxxTests tests TestWriteToMemoryBMP,TestWriteToMemory.cxx,NO_DATA NO_VALID NO_OUTPUT "test.bmp") if (VTK_USE_LARGE_DATA) - vtk_add_test_cxx(${vtk-module}CxxTests large_data_tests + vtk_add_test_cxx(vtkIOImageCxxTests large_data_tests TestMRCReader,TestMRCReader.cxx,NO_OUTPUT "DATA{${VTK_TEST_INPUT_DIR}/mrc/emd_1056.mrc}") list(APPEND data_tests ${large_data_tests}) @@ -90,6 +90,6 @@ set(all_tests ${data_tests} ${tests} ) -vtk_test_cxx_executable(${vtk-module}CxxTests all_tests +vtk_test_cxx_executable(vtkIOImageCxxTests all_tests RENDERING_FACTORY ) diff --git a/IO/Import/Testing/Cxx/CMakeLists.txt b/IO/Import/Testing/Cxx/CMakeLists.txt index 93421a0e3ad8921eaac3929f991967b2b107efa3..06f0e53b57de4e11a0427556c17b3b225d029367 100644 --- a/IO/Import/Testing/Cxx/CMakeLists.txt +++ b/IO/Import/Testing/Cxx/CMakeLists.txt @@ -1,5 +1,5 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOImportCxxTests tests TestVRMLImporter.cxx,NO_VALID TestVRMLNormals.cxx ) @@ -7,8 +7,8 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests list(APPEND tests TestOBJImporter.cxx) ExternalData_add_test(VTKData - NAME ${vtk-module}Cxx-OBJImport-SolidAndTextured - COMMAND ${vtk-module}CxxTests TestOBJImporter + NAME vtkIOImportCxx-OBJImport-SolidAndTextured + COMMAND vtkIOImportCxxTests TestOBJImporter DATA{../Data/Input/cube-scene.obj} DATA{../Data/Input/cube-scene.mtl} DATA{../Data/Input/noise.png} @@ -16,7 +16,7 @@ ExternalData_add_test(VTKData -T "${VTK_TEST_OUTPUT_DIR}" ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkIOImportCxxTests tests) include(vtkOpenGL) @@ -27,7 +27,7 @@ vtk_module_test_executable(vtkimportobj OBJImporter.cxx) vtk_opengl_link(vtkimportobj) ExternalData_add_test(VTKData - NAME ${vtk-module}Cxx-OBJImport-MixedOrder1 + NAME vtkIOImportCxx-OBJImport-MixedOrder1 COMMAND vtkimportobj "${VTK_TEST_OUTPUT_DIR}" DATA{../Data/Input/boxes_2.obj} @@ -36,14 +36,14 @@ ExternalData_add_test(VTKData ) ExternalData_add_test(VTKData - NAME ${vtk-module}Cxx-OBJImport-NoMTL + NAME vtkIOImportCxx-OBJImport-NoMTL COMMAND vtkimportobj "${VTK_TEST_OUTPUT_DIR}" DATA{../Data/Input/boxes_3_no_mtl.obj} ) ExternalData_add_test(VTKData - NAME ${vtk-module}Cxx-OBJImport-MTLwithoutTextureFile + NAME vtkIOImportCxx-OBJImport-MTLwithoutTextureFile COMMAND vtkimportobj "${VTK_TEST_OUTPUT_DIR}" DATA{../Data/Input/boxes_4_mtl_no_texture.obj} diff --git a/IO/Infovis/Testing/Cxx/CMakeLists.txt b/IO/Infovis/Testing/Cxx/CMakeLists.txt index c6bd6e15f2d61749bb955297bb4f9dcccf7059c2..3b83dd210e8bdfc888a38a13717e9404ff8ede7f 100644 --- a/IO/Infovis/Testing/Cxx/CMakeLists.txt +++ b/IO/Infovis/Testing/Cxx/CMakeLists.txt @@ -1,4 +1,4 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOInfovisCxxTests tests NO_VALID TestBiomTableReader.cxx TestDIMACSGraphReader.cxx @@ -13,4 +13,4 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests TestTulipReaderProperties.cxx TestDelimitedTextReader2.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkIOInfovisCxxTests tests) diff --git a/IO/LAS/Testing/Cxx/CMakeLists.txt b/IO/LAS/Testing/Cxx/CMakeLists.txt index e1bae48670235355ec39d26771136659a07dc9fc..7ef53367fc33bdc0fb22f0d97a93d190f81ab492 100644 --- a/IO/LAS/Testing/Cxx/CMakeLists.txt +++ b/IO/LAS/Testing/Cxx/CMakeLists.txt @@ -11,7 +11,7 @@ endfunction() add_vtk_las_reader_test(test_1.las 0) add_vtk_las_reader_test(test_2.las -90) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOLASCxxTests tests ${VTK_LAS_READER_TESTS} ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkIOLASCxxTests tests) diff --git a/IO/LSDyna/Testing/Cxx/CMakeLists.txt b/IO/LSDyna/Testing/Cxx/CMakeLists.txt index 18309883b24efc8ffdd3a8d53ebf17b2cb1cce82..914a03c4d49cd972ffe96e0f1162ba2855ad3268 100644 --- a/IO/LSDyna/Testing/Cxx/CMakeLists.txt +++ b/IO/LSDyna/Testing/Cxx/CMakeLists.txt @@ -7,7 +7,7 @@ if(VTK_USE_LARGE_DATA) "DATA{${VTK_TEST_INPUT_DIR}/LSDyna/impact/,REGEX:.*}" ) - vtk_add_test_cxx(${vtk-module}CxxTests tests + vtk_add_test_cxx(vtkIOLSDynaCxxTests tests TestLSDynaReader.cxx TestLSDynaReaderDeflection.cxx #TestLSDynaReaderNoDefl.cxx @@ -15,4 +15,4 @@ if(VTK_USE_LARGE_DATA) ) endif() -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkIOLSDynaCxxTests tests) diff --git a/IO/Legacy/Testing/Cxx/CMakeLists.txt b/IO/Legacy/Testing/Cxx/CMakeLists.txt index 553286ae124841a9a917ae0671211c51e48d0313..8a3a6ca1095756f7d6e0bc177c4f3e3aedb5c3a3 100644 --- a/IO/Legacy/Testing/Cxx/CMakeLists.txt +++ b/IO/Legacy/Testing/Cxx/CMakeLists.txt @@ -1,8 +1,8 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOLegacyCxxTests tests TestLegacyCompositeDataReaderWriter.cxx,NO_VALID TestLegacyGhostCellsImport.cxx TestLegacyArrayMetaData.cxx,NO_VALID ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests +vtk_test_cxx_executable(vtkIOLegacyCxxTests tests RENDERING_FACTORY ) diff --git a/IO/MPIImage/Testing/Cxx/CMakeLists.txt b/IO/MPIImage/Testing/Cxx/CMakeLists.txt index 9e1fbecd6443c9c9024b586d77134aa96028f7ae..05dc2ce239af28d575363f9f34860b8f9d7f624c 100644 --- a/IO/MPIImage/Testing/Cxx/CMakeLists.txt +++ b/IO/MPIImage/Testing/Cxx/CMakeLists.txt @@ -1,8 +1,8 @@ include(vtkMPI) -vtk_add_test_mpi(${vtk-module}CxxTests-MPI tests +vtk_add_test_mpi(vtkIOMPIImageCxxTests-MPI tests TESTING_DATA ParallelIso.cxx ParallelIso2.cxx ) -vtk_test_mpi_executable(${vtk-module}CxxTests-MPI tests) +vtk_test_mpi_executable(vtkIOMPIImageCxxTests-MPI tests) diff --git a/IO/MPIParallel/Testing/Cxx/CMakeLists.txt b/IO/MPIParallel/Testing/Cxx/CMakeLists.txt index 7d2ad9565b19eb8584db0f2d80fdedc8990ec441..2baa0e42c93e862bebc37564826c76542af410b7 100644 --- a/IO/MPIParallel/Testing/Cxx/CMakeLists.txt +++ b/IO/MPIParallel/Testing/Cxx/CMakeLists.txt @@ -16,9 +16,9 @@ if (VTK_USE_LARGE_DATA AND _known_little_endian AND NOT WIN32) ) set(TestPWindBladeReader_NUMPROCS 1) - vtk_add_test_mpi(${vtk-module}CxxTests-MPI tests + vtk_add_test_mpi(vtkIOMPIParallelCxxTests-MPI tests TESTING_DATA TestPWindBladeReader.cxx ) - vtk_test_mpi_executable(${vtk-module}CxxTests-MPI tests) + vtk_test_mpi_executable(vtkIOMPIParallelCxxTests-MPI tests) endif() diff --git a/IO/Movie/Testing/Cxx/CMakeLists.txt b/IO/Movie/Testing/Cxx/CMakeLists.txt index a7b3521ac829c0862d662edf6e5370b33b0b4957..d4b93f364999f23117f54fd1b857a315adc3e6e9 100644 --- a/IO/Movie/Testing/Cxx/CMakeLists.txt +++ b/IO/Movie/Testing/Cxx/CMakeLists.txt @@ -8,9 +8,9 @@ if(vtkIOMovie_vtkoggtheora) list(APPEND TEST_SRC TestOggTheoraWriter.cxx) endif() -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOMovieCxxTests tests NO_VALID ${TEST_SRC} ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkIOMovieCxxTests tests) diff --git a/IO/MySQL/Testing/Cxx/CMakeLists.txt b/IO/MySQL/Testing/Cxx/CMakeLists.txt index b6cc0c87f68df6f65055b2363122d4abf455cd67..73f535632e0e8768c7399f9ce7fdfc314d574386 100644 --- a/IO/MySQL/Testing/Cxx/CMakeLists.txt +++ b/IO/MySQL/Testing/Cxx/CMakeLists.txt @@ -11,11 +11,11 @@ if(VTK_MYSQL_TEST_URL) set(TestMySQLTableReadWrite_ARGS DATA{../Data/Input/simple_table.vtk}) endif() - vtk_add_test_cxx(${vtk-module}CxxTests tests + vtk_add_test_cxx(vtkIOMySQLCxxTests tests NO_DATA NO_VALID TestMySQLDatabase.cxx TestMySQLTableReadWrite.cxx ) - vtk_test_cxx_executable(${vtk-module}CxxTests tests) + vtk_test_cxx_executable(vtkIOMySQLCxxTests tests) endif() diff --git a/IO/NetCDF/Testing/Cxx/CMakeLists.txt b/IO/NetCDF/Testing/Cxx/CMakeLists.txt index f985cf719f45cdf44aa1b43ea355684d21060e7e..2a5a91c4a2fd07ce31ab3e0d19a01bd301ebd0f6 100644 --- a/IO/NetCDF/Testing/Cxx/CMakeLists.txt +++ b/IO/NetCDF/Testing/Cxx/CMakeLists.txt @@ -7,7 +7,7 @@ if(VTK_USE_LARGE_DATA) "DATA{${VTK_TEST_INPUT_DIR}/SLAC/pillbox/,REGEX:.*}" ) - vtk_add_test_cxx(${vtk-module}CxxTests tests + vtk_add_test_cxx(vtkIONetCDFCxxTests tests SLACMultipleModes.cxx SLACParticleReader.cxx SLACReaderLinear.cxx @@ -18,4 +18,4 @@ if(VTK_USE_LARGE_DATA) ) endif() -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkIONetCDFCxxTests tests) diff --git a/IO/ODBC/Testing/Cxx/CMakeLists.txt b/IO/ODBC/Testing/Cxx/CMakeLists.txt index 0e6f2bc19ea076c5842334b7f1da68de97da0454..b33f12050a34470e8586ab0b6edaedd1762ef625 100644 --- a/IO/ODBC/Testing/Cxx/CMakeLists.txt +++ b/IO/ODBC/Testing/Cxx/CMakeLists.txt @@ -4,9 +4,9 @@ if(VTK_ODBC_TEST_DSN) include_directories(${CMAKE_CURRENT_BINARY_DIR}) - vtk_add_test_cxx(${vtk-module}CxxTests tests + vtk_add_test_cxx(vtkIOODBCCxxTests tests NO_DATA NO_VALID TestODBCDatabase.cxx ) - vtk_test_cxx_executable(${vtk-module}CxxTests tests) + vtk_test_cxx_executable(vtkIOODBCCxxTests tests) endif() diff --git a/IO/PDAL/Testing/Cxx/CMakeLists.txt b/IO/PDAL/Testing/Cxx/CMakeLists.txt index 7cc9af2dd612d2e2faee335bc99eca3419dd9040..10e50b3d7dd0df519df6008559c32cea83869b41 100644 --- a/IO/PDAL/Testing/Cxx/CMakeLists.txt +++ b/IO/PDAL/Testing/Cxx/CMakeLists.txt @@ -12,7 +12,7 @@ endfunction() add_vtk_pdal_reader_test(test_1.las 0) add_vtk_pdal_reader_test(test_2.las -90) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOPDALCxxTests tests ${VTK_PDAL_READER_TESTS} ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkIOPDALCxxTests tests) diff --git a/IO/PLY/Testing/Cxx/CMakeLists.txt b/IO/PLY/Testing/Cxx/CMakeLists.txt index 045c8d6fdc25b46317d6d17e4c0f8a8d700c29b0..ff8700d51b8f4f2bbfb5f81b698537900ca34d36 100644 --- a/IO/PLY/Testing/Cxx/CMakeLists.txt +++ b/IO/PLY/Testing/Cxx/CMakeLists.txt @@ -1,4 +1,4 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOPLYCxxTests tests TestPLYReader.cxx TestPLYReaderIntensity.cxx TestPLYReaderPointCloud.cxx @@ -6,4 +6,4 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests TestPLYWriterAlpha.cxx TestPLYWriter.cxx,NO_VALID ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkIOPLYCxxTests tests) diff --git a/IO/Parallel/Testing/Cxx/CMakeLists.txt b/IO/Parallel/Testing/Cxx/CMakeLists.txt index 07393882c00eed3585ba97ca78a1c3a56ac78af0..7aac363f065cabb62a10fd61f9b1a19a5a7ec808 100644 --- a/IO/Parallel/Testing/Cxx/CMakeLists.txt +++ b/IO/Parallel/Testing/Cxx/CMakeLists.txt @@ -16,11 +16,11 @@ ExternalData_Expand_Arguments(VTKData _ "DATA{${VTK_TEST_INPUT_DIR}/OpenFOAM/cavity/system/,REGEX:.*}" "DATA{${VTK_TEST_INPUT_DIR}/OpenFOAM/cavity/system/,REGEX:.*}" ) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOParallelCxxTests tests TestPOpenFOAMReader.cxx TestBigEndianPlot3D.cxx,NO_VALID ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkIOParallelCxxTests tests) if(VTK_USE_LARGE_DATA) include(vtkMPI) @@ -30,10 +30,10 @@ if(VTK_USE_LARGE_DATA) "DATA{${VTK_TEST_INPUT_DIR}/SLAC/ll-9cell-f523/,REGEX:.*}" ) - vtk_add_test_mpi(${vtk-module}CxxTests-MPI tests + vtk_add_test_mpi(vtkIOParallelCxxTests-MPI tests TESTING_DATA PSLACReaderLinear.cxx PSLACReaderQuadratic.cxx ) - vtk_test_mpi_executable(${vtk-module}CxxTests-MPI tests) + vtk_test_mpi_executable(vtkIOParallelCxxTests-MPI tests) endif() diff --git a/IO/ParallelExodus/Testing/Cxx/CMakeLists.txt b/IO/ParallelExodus/Testing/Cxx/CMakeLists.txt index 884e38924e054ebdd20fcc1aed2d093f2a9adfdb..4580045bee2b640c28dba605eaa3a5fb3f354d76 100644 --- a/IO/ParallelExodus/Testing/Cxx/CMakeLists.txt +++ b/IO/ParallelExodus/Testing/Cxx/CMakeLists.txt @@ -1,5 +1,5 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOParallelExodusCxxTests tests NO_VALID TestExodusImplicitArrays.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkIOParallelExodusCxxTests tests) diff --git a/IO/ParallelLSDyna/Testing/Cxx/CMakeLists.txt b/IO/ParallelLSDyna/Testing/Cxx/CMakeLists.txt index 193ec09338d2512ffa16fe9c660ff236dfb054f8..673b0980f093d4524e9d5512ee28aac20a89ef5e 100644 --- a/IO/ParallelLSDyna/Testing/Cxx/CMakeLists.txt +++ b/IO/ParallelLSDyna/Testing/Cxx/CMakeLists.txt @@ -6,9 +6,9 @@ if(VTK_USE_LARGE_DATA) "DATA{${VTK_TEST_INPUT_DIR}/LSDyna/hemi.draw/,REGEX:.*}" ) - vtk_add_test_mpi(${vtk-module}CxxTests-MPI tests + vtk_add_test_mpi(vtkIOParallelLSDynaCxxTests-MPI tests TESTING_DATA PLSDynaReader.cxx ) - vtk_test_mpi_executable(${vtk-module}CxxTests-MPI tests) + vtk_test_mpi_executable(vtkIOParallelLSDynaCxxTests-MPI tests) endif() diff --git a/IO/ParallelNetCDF/Testing/Cxx/CMakeLists.txt b/IO/ParallelNetCDF/Testing/Cxx/CMakeLists.txt index a7883d705e2923f49fc97e03c0d988c5e3d1c091..26471c8589bb79cf4ed06424d57005cab4ad59fa 100644 --- a/IO/ParallelNetCDF/Testing/Cxx/CMakeLists.txt +++ b/IO/ParallelNetCDF/Testing/Cxx/CMakeLists.txt @@ -4,9 +4,9 @@ if(VTK_USE_LARGE_DATA) "DATA{${VTK_TEST_INPUT_DIR}/NetCDF/,REGEX:.*}" ) - vtk_add_test_cxx(${vtk-module}CxxTests tests + vtk_add_test_cxx(vtkIOParallelNetCDFCxxTests tests TestPNetCDFPOPReader.cxx ) endif() -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkIOParallelNetCDFCxxTests tests) diff --git a/IO/ParallelXML/Testing/Cxx/CMakeLists.txt b/IO/ParallelXML/Testing/Cxx/CMakeLists.txt index 7af648c239a42511d9fca57ca1ae9f16a909114d..b9f7e5d46b9b993723db56570bac7e93dff9369a 100644 --- a/IO/ParallelXML/Testing/Cxx/CMakeLists.txt +++ b/IO/ParallelXML/Testing/Cxx/CMakeLists.txt @@ -1,7 +1,7 @@ # note, to enable testing the vtkParallelMPI module should be enabled -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOParallelXMLCxxTests tests TestParallelUnstructuredGridIO.cxx,No_DATA,NO_VALID ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkIOParallelXMLCxxTests tests) diff --git a/IO/ParallelXdmf3/Testing/Cxx/CMakeLists.txt b/IO/ParallelXdmf3/Testing/Cxx/CMakeLists.txt index 8848243b8e6508c8f4d41ac34e6a2071c039284a..a0447c3eff91980151a2a42bbf2767a2aa51382b 100644 --- a/IO/ParallelXdmf3/Testing/Cxx/CMakeLists.txt +++ b/IO/ParallelXdmf3/Testing/Cxx/CMakeLists.txt @@ -6,19 +6,19 @@ if(VTK_MPI_MAX_NUMPROCS GREATER 1 AND VTK_USE_LARGE_DATA) foreach(test ${Xdmf3MPITests}) - vtk_module_test_executable(${vtk-module}Cxx-${test} ${test}.cxx) + vtk_module_test_executable(vtkIOParallelXdmf3Cxx-${test} ${test}.cxx) ExternalData_Expand_Arguments(VTKData _ "DATA{${VTK_TEST_INPUT_DIR}/XDMF/Iron/,REGEX:.*}" ) ExternalData_add_test(VTKData - NAME ${vtk-module}Cxx-${test} + NAME vtkIOParallelXdmf3Cxx-${test} COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} 2 ${MPIEXEC_PREFLAGS} - $ + $ -D ${VTK_TEST_DATA_DIR} -T ${VTK_TEST_OUTPUT_DIR} # -V DATA{../Data/Baseline/${test}.png,:} ${VTK_MPI_POSTFLAGS}) - vtk_mpi_link(${vtk-module}Cxx-${test}) + vtk_mpi_link(vtkIOParallelXdmf3Cxx-${test}) endforeach() endif() diff --git a/IO/PostgreSQL/Testing/Cxx/CMakeLists.txt b/IO/PostgreSQL/Testing/Cxx/CMakeLists.txt index 8ec15e877c981c4a311e30af29915a5655ff2141..adcf3b1a4feb3c71abde0b5a469bf7b58dbce432 100644 --- a/IO/PostgreSQL/Testing/Cxx/CMakeLists.txt +++ b/IO/PostgreSQL/Testing/Cxx/CMakeLists.txt @@ -11,11 +11,11 @@ if(VTK_PSQL_TEST_URL) set(TestPostgreSQLTableReadWrite_ARGS DATA{../Data/Input/simple_table.vtk}) endif() - vtk_add_test_cxx(${vtk-module}CxxTests tests + vtk_add_test_cxx(vtkIOPostgreSQLCxxTests tests NO_DATA NO_VALID TestPostgreSQLDatabase.cxx TestPostgreSQLTableReadWrite.cxx ) - vtk_test_cxx_executable(${vtk-module}CxxTests tests) + vtk_test_cxx_executable(vtkIOPostgreSQLCxxTests tests) endif() diff --git a/IO/SQL/Testing/Cxx/CMakeLists.txt b/IO/SQL/Testing/Cxx/CMakeLists.txt index 1ee8524e3d58e9828a8a3deebab27928860368f5..5c2fd8c11998c55a94150ace60e935a6be6aa806 100644 --- a/IO/SQL/Testing/Cxx/CMakeLists.txt +++ b/IO/SQL/Testing/Cxx/CMakeLists.txt @@ -1,16 +1,16 @@ set(TestSQLiteTableReadWrite_ARGS DATA{../Data/Input/simple_table.vtk}) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOSQLCxxTests tests NO_VALID TestSQLDatabaseSchema.cxx TestSQLiteDatabase.cxx TestSQLiteTableReadWrite.cxx,NO_DATA,NO_OUTPUT ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkIOSQLCxxTests tests) # Run these serial to avoid intermittent test failures on machines # that do parallel testing foreach(test IN LISTS tests) - set_tests_properties(${vtk-module}Cxx-${test} + set_tests_properties(vtkIOSQLCxx-${test} PROPERTIES RUN_SERIAL 1) endforeach() diff --git a/IO/SegY/Testing/Cxx/CMakeLists.txt b/IO/SegY/Testing/Cxx/CMakeLists.txt index 109be531ca41d1eacaec574ec32b2b5e710d2799..f3cc83ec1c0ed6649dfe9e8f807e0077dd275e43 100644 --- a/IO/SegY/Testing/Cxx/CMakeLists.txt +++ b/IO/SegY/Testing/Cxx/CMakeLists.txt @@ -2,8 +2,8 @@ ExternalData_Expand_Arguments(VTKData _ "DATA{${VTK_TEST_INPUT_DIR}/SegY/,REGEX:.*}" ) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOSegYCxxTests tests TestSegY2DReader.cxx TestSegY2DReaderZoom.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkIOSegYCxxTests tests) diff --git a/IO/TRUCHAS/Testing/Cxx/CMakeLists.txt b/IO/TRUCHAS/Testing/Cxx/CMakeLists.txt index d351ec4cd23a5c25bf9f9d943b0439b11ddd4409..19e2418a6bd1491e63c652385662f28eeec2aa3d 100644 --- a/IO/TRUCHAS/Testing/Cxx/CMakeLists.txt +++ b/IO/TRUCHAS/Testing/Cxx/CMakeLists.txt @@ -2,8 +2,8 @@ ExternalData_Expand_Arguments(VTKData _ "DATA{${VTK_TEST_INPUT_DIR}/TRUCHAS/,REGEX:.*}" ) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOTRUCHASCxxTests tests TestTRUCHASReader.cxx,NO_VALID ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests +vtk_test_cxx_executable(vtkIOTRUCHASCxxTests tests ) diff --git a/IO/TecplotTable/Testing/Cxx/CMakeLists.txt b/IO/TecplotTable/Testing/Cxx/CMakeLists.txt index 102cb223d5e9bf706fc4deb6090e6c65b10e7f19..a024073c9ca2798c1613c632dcf87a1e160a0cfb 100644 --- a/IO/TecplotTable/Testing/Cxx/CMakeLists.txt +++ b/IO/TecplotTable/Testing/Cxx/CMakeLists.txt @@ -1,13 +1,13 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOTecplotTableCxxTests tests NO_VALID TestTecplotTableReader.cxx ) ExternalData_add_test(VTKData NAME TestTecplotTableReader - COMMAND ${vtk-module}CxxTests TestTecplotTableReader + COMMAND vtkIOTecplotTableCxxTests TestTecplotTableReader -D DATA{../Data/residuals.dat} ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkIOTecplotTableCxxTests tests) diff --git a/IO/VPIC/Testing/Cxx/CMakeLists.txt b/IO/VPIC/Testing/Cxx/CMakeLists.txt index c344afe58c37af6d4fd98c64345b6e2341bf76b8..1182c223e23cee55b07daacc01bbec1ae8cca866 100644 --- a/IO/VPIC/Testing/Cxx/CMakeLists.txt +++ b/IO/VPIC/Testing/Cxx/CMakeLists.txt @@ -8,9 +8,9 @@ if(VTK_USE_LARGE_DATA) "DATA{${VTK_TEST_INPUT_DIR}/VPIC/hydro/T.100/,REGEX:.*}" ) - vtk_add_test_cxx(${vtk-module}CxxTests tests + vtk_add_test_cxx(vtkIOVPICCxxTests tests TestVPICReader.cxx ) endif() -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkIOVPICCxxTests tests) diff --git a/IO/XML/Testing/Cxx/CMakeLists.txt b/IO/XML/Testing/Cxx/CMakeLists.txt index ea77d1a016fadb39ecdf688c585af23d7ea2137c..43aef4eba1cc1a60305ab9623cb9b18dfb397045 100644 --- a/IO/XML/Testing/Cxx/CMakeLists.txt +++ b/IO/XML/Testing/Cxx/CMakeLists.txt @@ -1,5 +1,5 @@ set(TestXML_ARGS "DATA{${VTK_TEST_INPUT_DIR}/sample.xml}") -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOXMLCxxTests tests TestAMRXMLIO.cxx,NO_VALID TestDataObjectXMLIO.cxx,NO_VALID #TestHyperOctreeIO.cxx # HyperOctree is deprecated @@ -14,27 +14,27 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests ) # Each of these most be added in a separate vtk_add_test_cxx -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOXMLCxxTests tests TestXMLCompositeDataReaderDistribution.cxx,NO_VALID,NO_OUTPUT "DATA{${VTK_TEST_INPUT_DIR}/distTest.vtm,REGEX:distTest_[0-9]_0.vtp}" ) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOXMLCxxTests tests TestXMLReaderBadImageData,TestXMLReaderBadData.cxx,NO_VALID,NO_OUTPUT "DATA{${VTK_TEST_INPUT_DIR}/badImageData.xml}" ) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOXMLCxxTests tests TestXMLReaderBadPolyData,TestXMLReaderBadData.cxx,NO_VALID,NO_OUTPUT "DATA{${VTK_TEST_INPUT_DIR}/badPolyData.xml}" ) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOXMLCxxTests tests TestXMLReaderBadRectilinearGridData,TestXMLReaderBadData.cxx,NO_VALID,NO_OUTPUT "DATA{${VTK_TEST_INPUT_DIR}/badRectilinearGridData.xml}" ) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOXMLCxxTests tests TestXMLReaderBadUnstucturedGridData,TestXMLReaderBadData.cxx,NO_VALID,NO_OUTPUT "DATA{${VTK_TEST_INPUT_DIR}/badUnstructuredGridData.xml}" ) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOXMLCxxTests tests TestXMLReaderBadUniformGridData,TestXMLReaderBadData.cxx,NO_VALID,NO_OUTPUT "DATA{${VTK_TEST_INPUT_DIR}/badUniformGridData.xml}" ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkIOXMLCxxTests tests) add_executable(TestXMLCInterface MACOSX_BUNDLE TestXMLCInterface.c) target_link_libraries(TestXMLCInterface LINK_PRIVATE vtkIOXML) diff --git a/IO/Xdmf2/Testing/Cxx/CMakeLists.txt b/IO/Xdmf2/Testing/Cxx/CMakeLists.txt index f7a7b0e5d0c36238bc3aa54556f4319e4a1c1355..2d80189073a470a0fbf3ee545db74723dc97d9f1 100644 --- a/IO/Xdmf2/Testing/Cxx/CMakeLists.txt +++ b/IO/Xdmf2/Testing/Cxx/CMakeLists.txt @@ -2,8 +2,8 @@ ExternalData_Expand_Arguments(VTKData _ "DATA{${VTK_TEST_INPUT_DIR}/XDMF/,REGEX:.*}" ) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkIOXdmf2CxxTests tests TestTemporalXdmfReaderWriter.cxx,NO_VALID XdmfTestVTKIO.cxx,NO_VALID ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkIOXdmf2CxxTests tests) diff --git a/Imaging/Color/Testing/Cxx/CMakeLists.txt b/Imaging/Color/Testing/Cxx/CMakeLists.txt index bde5318dada54b58bcb72d9a6cc8185be026040d..784fa1b2f9621563bc28d261d83c67e24123e2b4 100644 --- a/Imaging/Color/Testing/Cxx/CMakeLists.txt +++ b/Imaging/Color/Testing/Cxx/CMakeLists.txt @@ -1,5 +1,5 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkImagingColorCxxTests tests ImageQuantizeToIndex.cxx,NO_VALID ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkImagingColorCxxTests tests) diff --git a/Imaging/Core/Testing/Cxx/CMakeLists.txt b/Imaging/Core/Testing/Cxx/CMakeLists.txt index e263354594a60ca3c7aac962f9b0d0558f7bb9eb..6920619dfd6fe60aaa05e9d710cfd948b977824c 100644 --- a/Imaging/Core/Testing/Cxx/CMakeLists.txt +++ b/Imaging/Core/Testing/Cxx/CMakeLists.txt @@ -1,4 +1,4 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkImagingCoreCxxTests tests FastSplatter.cxx ImageAccumulate.cxx,NO_VALID ImageAccumulateLarge.cxx,NO_VALID,NO_DATA,NO_OUTPUT 32 @@ -28,24 +28,24 @@ list(APPEND tests # The stencil test is special ExternalData_add_test(VTKData - NAME ${vtk-module}Cxx-AddStencilData - COMMAND ${vtk-module}CxxTests TestImageStencilData 1 + NAME vtkImagingCoreCxx-AddStencilData + COMMAND vtkImagingCoreCxxTests TestImageStencilData 1 -D ${VTK_TEST_DATA_DIR} -T ${VTK_TEST_OUTPUT_DIR} -V DATA{../Data/Baseline/TestAddStencilData.png,:}) ExternalData_add_test(VTKData - NAME ${vtk-module}Cxx-SubtractStencilData - COMMAND ${vtk-module}CxxTests TestImageStencilData 2 + NAME vtkImagingCoreCxx-SubtractStencilData + COMMAND vtkImagingCoreCxxTests TestImageStencilData 2 -D ${VTK_TEST_DATA_DIR} -T ${VTK_TEST_OUTPUT_DIR} -V DATA{../Data/Baseline/TestSubtractStencilData.png,:}) ExternalData_add_test(VTKData - NAME ${vtk-module}Cxx-ClipStencilData - COMMAND ${vtk-module}CxxTests TestImageStencilData 3 + NAME vtkImagingCoreCxx-ClipStencilData + COMMAND vtkImagingCoreCxxTests TestImageStencilData 3 -D ${VTK_TEST_DATA_DIR} -T ${VTK_TEST_OUTPUT_DIR} -V DATA{../Data/Baseline/TestClipStencilData.png,:}) -vtk_test_cxx_executable(${vtk-module}CxxTests tests +vtk_test_cxx_executable(vtkImagingCoreCxxTests tests RENDERING_FACTORY ) diff --git a/Imaging/Hybrid/Testing/Cxx/CMakeLists.txt b/Imaging/Hybrid/Testing/Cxx/CMakeLists.txt index c09a1a54538353e5f5d7761ee1d172ddb00140c4..9cef7d6edf34352ecbc32da9f7639be8c97f4afa 100644 --- a/Imaging/Hybrid/Testing/Cxx/CMakeLists.txt +++ b/Imaging/Hybrid/Testing/Cxx/CMakeLists.txt @@ -1,7 +1,7 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkImagingHybridCxxTests tests TestImageToPoints.cxx TestSampleFunction.cxx,NO_DATA,NO_VALID,NO_OUTPUT ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests +vtk_test_cxx_executable(vtkImagingHybridCxxTests tests RENDERING_FACTORY ) diff --git a/Imaging/Morphological/Testing/Cxx/CMakeLists.txt b/Imaging/Morphological/Testing/Cxx/CMakeLists.txt index 263c55feef1d225feed8ea1df4381c0a2ffe5832..5a68f4424e17d26f484250de461c3ecbc2d4e0be 100644 --- a/Imaging/Morphological/Testing/Cxx/CMakeLists.txt +++ b/Imaging/Morphological/Testing/Cxx/CMakeLists.txt @@ -1,8 +1,8 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkImagingMorphologicalCxxTests tests TestImageThresholdConnectivity.cxx TestImageConnectivityFilter.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests +vtk_test_cxx_executable(vtkImagingMorphologicalCxxTests tests RENDERING_FACTORY ) diff --git a/Imaging/OpenGL2/Testing/Cxx/CMakeLists.txt b/Imaging/OpenGL2/Testing/Cxx/CMakeLists.txt index 7ecffad5165b03f4462dc45fc90f1f1535e8689b..95ceda135048d9d64e25e5595626d1d6a84b4ce2 100644 --- a/Imaging/OpenGL2/Testing/Cxx/CMakeLists.txt +++ b/Imaging/OpenGL2/Testing/Cxx/CMakeLists.txt @@ -1,5 +1,5 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkImagingOpenGL2CxxTests tests TestOpenGLImageGradient.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests RENDERING_FACTORY) +vtk_test_cxx_executable(vtkImagingOpenGL2CxxTests tests RENDERING_FACTORY) diff --git a/Infovis/Boost/Testing/Cxx/CMakeLists.txt b/Infovis/Boost/Testing/Cxx/CMakeLists.txt index f3af0dcb0299d57439e2ed201593e6cbd003885b..d95c8863ac58277dc2018f63a4d3f76880fd8151 100644 --- a/Infovis/Boost/Testing/Cxx/CMakeLists.txt +++ b/Infovis/Boost/Testing/Cxx/CMakeLists.txt @@ -3,10 +3,10 @@ find_package(Boost REQUIRED ) include_directories(${Boost_INCLUDE_DIRS}) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkInfovisBoostCxxTests tests NO_DATA NO_VALID NO_OUTPUT TestVariantSerialization.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkInfovisBoostCxxTests tests) -vtk_module_link_libraries(${vtk-module}CxxTests LINK_PRIVATE ${Boost_SERIALIZATION_LIBRARY}) +vtk_module_link_libraries(vtkInfovisBoostCxxTests LINK_PRIVATE ${Boost_SERIALIZATION_LIBRARY}) diff --git a/Infovis/BoostGraphAlgorithms/Testing/Cxx/CMakeLists.txt b/Infovis/BoostGraphAlgorithms/Testing/Cxx/CMakeLists.txt index f3ad303f9cf6b121c0368dc558253b468d3e5996..8a85af22b24586d359717ac529673d5d3fad51eb 100644 --- a/Infovis/BoostGraphAlgorithms/Testing/Cxx/CMakeLists.txt +++ b/Infovis/BoostGraphAlgorithms/Testing/Cxx/CMakeLists.txt @@ -1,7 +1,7 @@ find_package(Boost REQUIRED) include_directories(${Boost_INCLUDE_DIRS}) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkInfovisBoostGraphAlgorithmsCxxTests tests # BoostArrayLogWeighting.cxx # todo (unsatisfied deps) BoostArrayRandomSparseArraySource.cxx,NO_VALID TestBoostAdapter.cxx,NO_VALID @@ -12,4 +12,4 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests TestBoostExtractLargestComponent.cxx,NO_VALID TestBoostSplitTableField.cxx,NO_VALID ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkInfovisBoostGraphAlgorithmsCxxTests tests) diff --git a/Infovis/Core/Testing/Cxx/CMakeLists.txt b/Infovis/Core/Testing/Cxx/CMakeLists.txt index 14b9e40772446d2d491207d16cbcda48c7924c95..f7b651c3d24898751d7745122047e3b68f97b11f 100644 --- a/Infovis/Core/Testing/Cxx/CMakeLists.txt +++ b/Infovis/Core/Testing/Cxx/CMakeLists.txt @@ -3,7 +3,7 @@ set(NEEDS_DATA TestMergeTables.cxx,NO_VALID ) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkInfovisCoreCxxTests tests ${NEEDS_DATA} ArrayDotProductSimilarity.cxx,NO_VALID,NO_DATA ArraySparseArrayToTable.cxx,NO_VALID @@ -28,4 +28,4 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests TestTreeDifferenceFilter.cxx,NO_VALID ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkInfovisCoreCxxTests tests) diff --git a/Infovis/Layout/Testing/Cxx/CMakeLists.txt b/Infovis/Layout/Testing/Cxx/CMakeLists.txt index aaa570361b8a517faa14fa4c759fdba3ed00c3e6..e00f47e068d29ee16f6dfecca08ef876e9c6282b 100644 --- a/Infovis/Layout/Testing/Cxx/CMakeLists.txt +++ b/Infovis/Layout/Testing/Cxx/CMakeLists.txt @@ -1,4 +1,4 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkInfovisLayoutCxxTests tests # TestAssignCoordinates.cxx # todo (unsatisfied deps) TestChacoGraphReader.cxx TestCirclePackLayoutStrategy.cxx @@ -7,4 +7,4 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests TestIncrementalForceLayout.cxx,NO_VALID TestTreeMapLayoutStrategy.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkInfovisLayoutCxxTests tests) diff --git a/Interaction/Widgets/Testing/Cxx/CMakeLists.txt b/Interaction/Widgets/Testing/Cxx/CMakeLists.txt index 494c072f5b5645f530d71abd27b49ae55e77b4e8..f96712d2a11f9bb253661a24050d3a835ec193cd 100644 --- a/Interaction/Widgets/Testing/Cxx/CMakeLists.txt +++ b/Interaction/Widgets/Testing/Cxx/CMakeLists.txt @@ -1,6 +1,6 @@ set(TestOrientedGlyphContour_ARGS "--PlaybackFile" "DATA{../Data/Input/TestOrientedGlyphContourEventLog.txt}") set(TerrainPolylineEditor_ARGS -ProjectionMode 2 -HeightOffset 100) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkInteractionWidgetsCxxTests tests BoxWidget.cxx BoxWidget2.cxx ImagePlaneWidget.cxx @@ -65,7 +65,7 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests TestSplineWidget.cxx TestTextWidget.cxx ) -vtk_add_test_cxx(${vtk-module}CxxTests no_valid_tests +vtk_add_test_cxx(vtkInteractionWidgetsCxxTests no_valid_tests NO_VALID vtkAngleRepresentation2DTest1.cxx vtkAngleRepresentation3DTest1.cxx @@ -92,7 +92,7 @@ vtk_add_test_cxx(${vtk-module}CxxTests no_valid_tests ) # Tests with data -vtk_add_test_cxx(${vtk-module}CxxTests data_tests +vtk_add_test_cxx(vtkInteractionWidgetsCxxTests data_tests TestButtonWidget.cxx TestButtonWidgetMultipleViewports.cxx TestDijkstraGraphGeodesicPath.cxx @@ -112,7 +112,7 @@ vtk_add_test_cxx(${vtk-module}CxxTests data_tests ) if(NOT VTK_OPENGL_HAS_OSMESA) - vtk_add_test_cxx(${vtk-module}CxxTests ogl_tests + vtk_add_test_cxx(vtkInteractionWidgetsCxxTests ogl_tests TestPickingManagerWidgets.cxx ) endif() @@ -123,7 +123,7 @@ set(all_tests ${data_tests} ${ogl_tests} ) -vtk_test_cxx_executable(${vtk-module}CxxTests all_tests +vtk_test_cxx_executable(vtkInteractionWidgetsCxxTests all_tests RENDERING_FACTORY ) @@ -131,7 +131,7 @@ vtk_test_cxx_executable(${vtk-module}CxxTests all_tests if(NOT VTK_TEST_TIMEOUT_TerrainPolylineEditor) set(VTK_TEST_TIMEOUT_TerrainPolylineEditor 90) endif() -set_tests_properties(${vtk-module}Cxx-TerrainPolylineEditor +set_tests_properties(vtkInteractionWidgetsCxx-TerrainPolylineEditor PROPERTIES TIMEOUT ${VTK_TEST_TIMEOUT_TerrainPolylineEditor}) if(NOT VTK_OPENGL_HAS_OSMESA) @@ -139,7 +139,7 @@ if(NOT VTK_OPENGL_HAS_OSMESA) if(NOT VTK_TEST_TIMEOUT_TestPickingManagerSeedWidget) set(VTK_TEST_TIMEOUT_TestPickingManagerSeedWidget 60) endif() - set_tests_properties(${vtk-module}Cxx-TestPickingManagerSeedWidget + set_tests_properties(vtkInteractionWidgetsCxx-TestPickingManagerSeedWidget PROPERTIES TIMEOUT ${VTK_TEST_TIMEOUT_TestPickingManagerSeedWidget}) endif() @@ -148,6 +148,6 @@ endif() if(NOT VTK_TEST_TIMEOUT_TestSphereHandleWidget) set(VTK_TEST_TIMEOUT_TestSphereHandleWidget 300) endif() -set_tests_properties(${vtk-module}Cxx-TestSphereHandleWidget +set_tests_properties(vtkInteractionWidgetsCxx-TestSphereHandleWidget PROPERTIES TIMEOUT ${VTK_TEST_TIMEOUT_TestSphereHandleWidget} RUN_SERIAL ON) diff --git a/Parallel/Core/Testing/Cxx/CMakeLists.txt b/Parallel/Core/Testing/Cxx/CMakeLists.txt index b9467033111c41ec0fdcede6c729a1ad72633b2b..b7ef938e3af5ee639518726e4522d5cf47b8b2f5 100644 --- a/Parallel/Core/Testing/Cxx/CMakeLists.txt +++ b/Parallel/Core/Testing/Cxx/CMakeLists.txt @@ -1,23 +1,23 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkParallelCoreCxxTests tests NO_DATA NO_VALID NO_OUTPUT TestFieldDataSerialization.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkParallelCoreCxxTests tests) if (PYTHON_EXECUTABLE) vtk_module_test_executable( - ${vtk-module}-TestSocketCommunicator TestSocketCommunicator.cxx) + vtkParallelCore-TestSocketCommunicator TestSocketCommunicator.cxx) - add_test(NAME ${vtk-module}-TestSocketCommunicator + add_test(NAME vtkParallelCore-TestSocketCommunicator COMMAND ${PYTHON_EXECUTABLE} ${VTK_CMAKE_DIR}/vtkTestDriver.py # indicate that the processes are not run sequentially, --process - $ + $ -T ${VTK_TEST_OUTPUT_DIR} --server --process - $ + $ -T ${VTK_TEST_OUTPUT_DIR} ) endif() diff --git a/Parallel/MPI/Testing/Cxx/CMakeLists.txt b/Parallel/MPI/Testing/Cxx/CMakeLists.txt index 171da58f863392f8abf2cd334759b3e66561c93d..a264da4ea57468068ce7a6c5b0194772cc358721 100644 --- a/Parallel/MPI/Testing/Cxx/CMakeLists.txt +++ b/Parallel/MPI/Testing/Cxx/CMakeLists.txt @@ -1,10 +1,10 @@ include(vtkMPI) -vtk_add_test_mpi(${vtk-module}CxxTests-MPI tests +vtk_add_test_mpi(vtkParallelMPICxxTests-MPI tests TESTING_DATA TestPProbe.cxx ) -vtk_add_test_mpi(${vtk-module}CxxTests-MPI no_data_tests +vtk_add_test_mpi(vtkParallelMPICxxTests-MPI no_data_tests GenericCommunicator.cxx MPIController.cxx PDirectory.cxx @@ -18,6 +18,6 @@ set(all_tests ${tests} ${no_data_tests} ) -vtk_test_mpi_executable(${vtk-module}CxxTests-MPI all_tests +vtk_test_mpi_executable(vtkParallelMPICxxTests-MPI all_tests ExerciseMultiProcessController.cxx ) diff --git a/Rendering/Annotation/Testing/Cxx/CMakeLists.txt b/Rendering/Annotation/Testing/Cxx/CMakeLists.txt index bea2d55b37d29d9a4b1a97f184231cd3fc4c5765..5adb84f9a71baf5b2971312c462e54ede60b6753 100644 --- a/Rendering/Annotation/Testing/Cxx/CMakeLists.txt +++ b/Rendering/Annotation/Testing/Cxx/CMakeLists.txt @@ -1,4 +1,4 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkRenderingAnnotationCxxTests tests TestAxisActor.cxx TestAxisActor2D.cxx TestAxisActor3D.cxx @@ -38,5 +38,5 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests TestXYPlotActor.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests +vtk_test_cxx_executable(vtkRenderingAnnotationCxxTests tests RENDERING_FACTORY) diff --git a/Rendering/Context2D/Testing/Cxx/CMakeLists.txt b/Rendering/Context2D/Testing/Cxx/CMakeLists.txt index 32e2a728cc60331797df550d164457b375976541..28fa5c4570f8b640ec373fbd341b52d979704909 100644 --- a/Rendering/Context2D/Testing/Cxx/CMakeLists.txt +++ b/Rendering/Context2D/Testing/Cxx/CMakeLists.txt @@ -1,7 +1,7 @@ # Generic tests -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkRenderingContext2DCxxTests tests TestContext2D.cxx,NO_VALID TestPolyDataToContext.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkRenderingContext2DCxxTests tests) diff --git a/Rendering/Core/Testing/Cxx/CMakeLists.txt b/Rendering/Core/Testing/Cxx/CMakeLists.txt index 40a23c77a2d6a0ca860b32a5fd071970ae55516b..2da094b125d91d9c4057753510703e7384fbf567 100644 --- a/Rendering/Core/Testing/Cxx/CMakeLists.txt +++ b/Rendering/Core/Testing/Cxx/CMakeLists.txt @@ -3,7 +3,7 @@ if (VTK_DEFAULT_RENDER_WINDOW_OFFSCREEN) list(APPEND extra_opengl2_tests TestOffscreenIsOffscreen.cxx,NO_DATA,NO_VALID) endif() -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkRenderingCoreCxxTests tests ${extra_opengl2_tests} TestBlockOpacity.cxx TestCompositePolyDataMapper2.cxx,NO_DATA @@ -103,4 +103,4 @@ set_source_files_properties( TestEdgeFlags.cxx # fails on OpenGL Mesa PROPERTIES COMPILE_FLAGS -DVTK_OPENGL2) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkRenderingCoreCxxTests tests) diff --git a/Rendering/External/Testing/Cxx/CMakeLists.txt b/Rendering/External/Testing/Cxx/CMakeLists.txt index 50e6e1dc11f355f4ec5b4fda844e0141ed621941..dd428a0d8a1bac1d4b08ce082f666c0537f06b60 100644 --- a/Rendering/External/Testing/Cxx/CMakeLists.txt +++ b/Rendering/External/Testing/Cxx/CMakeLists.txt @@ -6,12 +6,12 @@ INCLUDE_DIRECTORIES( ${GLUT_INCLUDE_DIR} ) -VTK_ADD_TEST_CXX(${vtk-module}CxxTests tests +VTK_ADD_TEST_CXX(vtkRenderingExternalCxxTests tests TestGLUTRenderWindow.cxx ) -VTK_TEST_CXX_EXECUTABLE(${vtk-module}CxxTests tests) -TARGET_LINK_LIBRARIES(${vtk-module}CxxTests LINK_PRIVATE +VTK_TEST_CXX_EXECUTABLE(vtkRenderingExternalCxxTests tests) +TARGET_LINK_LIBRARIES(vtkRenderingExternalCxxTests LINK_PRIVATE vtkRenderingExternal ${OPENGL_LIBRARIES} ${GLUT_LIBRARY}) include(vtkOpenGL) -vtk_opengl_link(${vtk-module}CxxTests) \ No newline at end of file +vtk_opengl_link(vtkRenderingExternalCxxTests) diff --git a/Rendering/FreeType/Testing/Cxx/CMakeLists.txt b/Rendering/FreeType/Testing/Cxx/CMakeLists.txt index 6a76c0831eff01618b0ebd3dd746f3a0ace9b414..829e2dc65fb406ca3551c9dbcea9a1ed13d559dd 100644 --- a/Rendering/FreeType/Testing/Cxx/CMakeLists.txt +++ b/Rendering/FreeType/Testing/Cxx/CMakeLists.txt @@ -3,7 +3,7 @@ set(TestFreeTypeTextMapperNoMath_ARGS DATA{../Data/Fonts/DejaVuSans.ttf}) set(TestMathTextFreeTypeTextRendererNoMath_ARGS DATA{../Data/Fonts/DejaVuSans.ttf} ) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkRenderingFreeTypeCxxTests tests TestBillboardTextActor3D.cxx TestFTStringToPath.cxx TestFreeTypeTextMapperNoMath.cxx @@ -20,7 +20,7 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests TestTextOpaquePass.cxx ) -vtk_add_test_cxx(${vtk-module}CxxTests no_data_tests +vtk_add_test_cxx(vtkRenderingFreeTypeCxxTests no_data_tests NO_DATA NO_VALID NO_OUTPUT TestTextBoundingBox.cxx ) @@ -29,8 +29,8 @@ list(APPEND tests # Check for vtkErrorMacro calls in these tests (mainly for empty inputs): set_tests_properties( - ${vtk-module}Cxx-TestTextActor - ${vtk-module}Cxx-TestTextActor3D + vtkRenderingFreeTypeCxx-TestTextActor + vtkRenderingFreeTypeCxx-TestTextActor3D PROPERTIES FAIL_REGULAR_EXPRESSION "ERROR:" ) @@ -39,7 +39,7 @@ if(${Module_vtkRenderingMatplotlib}) set(TestFreeTypeTextMapper_ARGS DATA{../Data/Fonts/DejaVuSans.ttf}) set(TestFontDPIScaling_ARGS DATA{../Data/Fonts/DejaVuSans.ttf}) - vtk_add_test_cxx(${vtk-module}CxxTests matplotlib_tests + vtk_add_test_cxx(vtkRenderingFreeTypeCxxTests matplotlib_tests TestMathTextFreeTypeTextRenderer.cxx TestFreeTypeTextMapper.cxx TestFontDPIScaling.cxx @@ -48,5 +48,5 @@ if(${Module_vtkRenderingMatplotlib}) ${matplotlib_tests}) endif() -vtk_test_cxx_executable(${vtk-module}CxxTests tests +vtk_test_cxx_executable(vtkRenderingFreeTypeCxxTests tests RENDERING_FACTORY) diff --git a/Rendering/FreeTypeFontConfig/Testing/Cxx/CMakeLists.txt b/Rendering/FreeTypeFontConfig/Testing/Cxx/CMakeLists.txt index a27152e442a2dae70201aec92bb982c0e8bee6fe..0268285809537380f1726c65d02824e99c5ead74 100644 --- a/Rendering/FreeTypeFontConfig/Testing/Cxx/CMakeLists.txt +++ b/Rendering/FreeTypeFontConfig/Testing/Cxx/CMakeLists.txt @@ -1,5 +1,5 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkRenderingFreeTypeFontConfigCxxTests tests TestSystemFontRendering.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests +vtk_test_cxx_executable(vtkRenderingFreeTypeFontConfigCxxTests tests RENDERING_FACTORY) diff --git a/Rendering/GL2PSOpenGL2/Testing/Cxx/CMakeLists.txt b/Rendering/GL2PSOpenGL2/Testing/Cxx/CMakeLists.txt index e1432fbb959f08cc1f26e0c1faff787dbb351fc2..834150a109f326edc21555e2a26fb5037bce16e0 100644 --- a/Rendering/GL2PSOpenGL2/Testing/Cxx/CMakeLists.txt +++ b/Rendering/GL2PSOpenGL2/Testing/Cxx/CMakeLists.txt @@ -8,7 +8,7 @@ if(VTK_GHOSTSCRIPT_EXECUTABLE) ) endif() -vtk_add_test_cxx(${vtk-module}CxxTests tests NO_VALID ${GL2PSTests}) +vtk_add_test_cxx(vtkRenderingGL2PSOpenGL2CxxTests tests NO_VALID ${GL2PSTests}) # Create rasterize/verify tests to check generated postscript: vtk_add_gl2ps_test_cxx(${GL2PSTests}) @@ -17,4 +17,4 @@ vtk_add_gl2ps_test_cxx(${GL2PSTests}) # disk, not generated in VTK). list(APPEND tests PNGCompare) -vtk_test_cxx_executable(${vtk-module}CxxTests tests RENDERING_FACTORY) +vtk_test_cxx_executable(vtkRenderingGL2PSOpenGL2CxxTests tests RENDERING_FACTORY) diff --git a/Rendering/Image/Testing/Cxx/CMakeLists.txt b/Rendering/Image/Testing/Cxx/CMakeLists.txt index 321376bff1f52251f77db518143fe428674d7145..06bd2616178f69a165030ce5f0486101eb210abd 100644 --- a/Rendering/Image/Testing/Cxx/CMakeLists.txt +++ b/Rendering/Image/Testing/Cxx/CMakeLists.txt @@ -1,4 +1,4 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkRenderingImageCxxTests tests TestCellPickerImage.cxx TestImageSliceMapperAlpha.cxx TestImageResliceMapperAlpha.cxx @@ -16,4 +16,4 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests TestImageResliceMapperSlab.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkRenderingImageCxxTests tests) diff --git a/Rendering/LICOpenGL2/Testing/Cxx/CMakeLists.txt b/Rendering/LICOpenGL2/Testing/Cxx/CMakeLists.txt index d1bdf37faec1cf865c75b3b2ab66d9aab5325ed2..d3194cc0d63fa37d4885dbed78160c17306a8bcd 100644 --- a/Rendering/LICOpenGL2/Testing/Cxx/CMakeLists.txt +++ b/Rendering/LICOpenGL2/Testing/Cxx/CMakeLists.txt @@ -1,6 +1,6 @@ # basic tests on the legacy filters # exercises line integral convolution 2d -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkRenderingLICOpenGL2CxxTests tests TestImageDataLIC2D.cxx TestStructuredGridLIC2DXSlice.cxx TestStructuredGridLIC2DYSlice.cxx @@ -16,22 +16,22 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests list(APPEND tests TestSurfaceLIC ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests +vtk_test_cxx_executable(vtkRenderingLICOpenGL2CxxTests tests RENDERING_FACTORY vtkStructuredGridLIC2DTestDriver.cxx vtkSurfaceLICTestDriver.cxx ) # vtkSurfaceLICTestDriver needs OpenGL include(vtkOpenGL) -vtk_opengl_link(${vtk-module}CxxTests) +vtk_opengl_link(vtkRenderingLICOpenGL2CxxTests) # surface lic on a curved surface ExternalData_add_test(VTKData - NAME ${vtk-module}Cxx-SurfaceLICCurvedDefaults - COMMAND ${vtk-module}CxxTests TestSurfaceLIC + NAME vtkRenderingLICOpenGL2Cxx-SurfaceLICCurvedDefaults + COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC -D ${VTK_TEST_DATA_DIR} -T ${VTK_TEST_OUTPUT_DIR} - -V "DATA{${${vtk-module}_SOURCE_DIR}/Testing/Data/Baseline/TestSurfaceLICCurvedDefaults.png,:}" + -V "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TestSurfaceLICCurvedDefaults.png,:}" --step-size=0.4 --num-steps=40 --camera-config=1 @@ -39,11 +39,11 @@ ExternalData_add_test(VTKData --vectors=V ) ExternalData_add_test(VTKData - NAME ${vtk-module}Cxx-SurfaceLICCurvedContrastEnhancedBlended - COMMAND ${vtk-module}CxxTests TestSurfaceLIC + NAME vtkRenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedBlended + COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC -D ${VTK_TEST_DATA_DIR} -T ${VTK_TEST_OUTPUT_DIR} - -V "DATA{${${vtk-module}_SOURCE_DIR}/Testing/Data/Baseline/TestSurfaceLICCurvedContrastEnhancedBlended.png,:}" + -V "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TestSurfaceLICCurvedContrastEnhancedBlended.png,:}" --step-size=0.4 --num-steps=40 --camera-config=1 @@ -53,11 +53,11 @@ ExternalData_add_test(VTKData --lic-intensity=0.8 ) ExternalData_add_test(VTKData - NAME ${vtk-module}Cxx-SurfaceLICCurvedContrastEnhancedMapped - COMMAND ${vtk-module}CxxTests TestSurfaceLIC + NAME vtkRenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedMapped + COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC -D ${VTK_TEST_DATA_DIR} -T ${VTK_TEST_OUTPUT_DIR} - -V "DATA{${${vtk-module}_SOURCE_DIR}/Testing/Data/Baseline/TestSurfaceLICCurvedContrastEnhancedMapped.png,:}" + -V "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TestSurfaceLICCurvedContrastEnhancedMapped.png,:}" --step-size=0.4 --num-steps=40 --camera-config=1 @@ -67,11 +67,11 @@ ExternalData_add_test(VTKData --color-mode=1 ) ExternalData_add_test(VTKData - NAME ${vtk-module}Cxx-SurfaceLICCurvedEnhancedVectorNormalizeOff - COMMAND ${vtk-module}CxxTests TestSurfaceLIC + NAME vtkRenderingLICOpenGL2Cxx-SurfaceLICCurvedEnhancedVectorNormalizeOff + COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC -D ${VTK_TEST_DATA_DIR} -T ${VTK_TEST_OUTPUT_DIR} - -V "DATA{${${vtk-module}_SOURCE_DIR}/Testing/Data/Baseline/TestSurfaceLICCurvedEnhancedVectorNormalizeOff.png,:}" + -V "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TestSurfaceLICCurvedEnhancedVectorNormalizeOff.png,:}" --data=${VTK_TEST_DATA_DIR}/Data/disk_out_ref_surface.vtp --camera-config=1 --vectors=V @@ -82,11 +82,11 @@ ExternalData_add_test(VTKData --color-mode=1 ) ExternalData_add_test(VTKData - NAME ${vtk-module}Cxx-SurfaceLICCurvedContrastEnhancedBlendedSmallGrain - COMMAND ${vtk-module}CxxTests TestSurfaceLIC + NAME vtkRenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedBlendedSmallGrain + COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC -D ${VTK_TEST_DATA_DIR} -T ${VTK_TEST_OUTPUT_DIR} - -V "DATA{${${vtk-module}_SOURCE_DIR}/Testing/Data/Baseline/TestSurfaceLICCurvedContrastEnhancedBlendedSmallGrain.png,:}" + -V "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TestSurfaceLICCurvedContrastEnhancedBlendedSmallGrain.png,:}" --camera-config=1 --data=${VTK_TEST_DATA_DIR}/Data/disk_out_ref_surface.vtp --vectors=V @@ -101,11 +101,11 @@ ExternalData_add_test(VTKData --lic-intensity=0.8 ) ExternalData_add_test(VTKData - NAME ${vtk-module}Cxx-SurfaceLICCurvedContrastEnhancedMappedSmallGrain - COMMAND ${vtk-module}CxxTests TestSurfaceLIC + NAME vtkRenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedMappedSmallGrain + COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC -D ${VTK_TEST_DATA_DIR} -T ${VTK_TEST_OUTPUT_DIR} - -V "DATA{${${vtk-module}_SOURCE_DIR}/Testing/Data/Baseline/TestSurfaceLICCurvedContrastEnhancedMappedSmallGrain.png,:}" + -V "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TestSurfaceLICCurvedContrastEnhancedMappedSmallGrain.png,:}" --camera-config=1 --data=${VTK_TEST_DATA_DIR}/Data/disk_out_ref_surface.vtp --vectors=V @@ -119,11 +119,11 @@ ExternalData_add_test(VTKData --color-mode=1 ) ExternalData_add_test(VTKData - NAME ${vtk-module}Cxx-SurfaceLICCurvedContrastEnhancedMappedSmallVectorNormalizeOff - COMMAND ${vtk-module}CxxTests TestSurfaceLIC + NAME vtkRenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedMappedSmallVectorNormalizeOff + COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC -D ${VTK_TEST_DATA_DIR} -T ${VTK_TEST_OUTPUT_DIR} - -V "DATA{${${vtk-module}_SOURCE_DIR}/Testing/Data/Baseline/TestSurfaceLICCurvedContrastEnhancedMappedSmallVectorNormalizeOff.png,:}" + -V "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TestSurfaceLICCurvedContrastEnhancedMappedSmallVectorNormalizeOff.png,:}" --data=${VTK_TEST_DATA_DIR}/Data/disk_out_ref_surface.vtp --camera-config=1 --vectors=V @@ -139,11 +139,11 @@ ExternalData_add_test(VTKData --color-mode=1 ) ExternalData_add_test(VTKData - NAME ${vtk-module}Cxx-SurfaceLICCurvedDefaultsColor - COMMAND ${vtk-module}CxxTests TestSurfaceLIC + NAME vtkRenderingLICOpenGL2Cxx-SurfaceLICCurvedDefaultsColor + COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC -D ${VTK_TEST_DATA_DIR} -T ${VTK_TEST_OUTPUT_DIR} - -V "DATA{${${vtk-module}_SOURCE_DIR}/Testing/Data/Baseline/TestSurfaceLICCurvedDefaultsColor.png,:}" + -V "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TestSurfaceLICCurvedDefaultsColor.png,:}" --step-size=0.4 --num-steps=40 --camera-config=1 @@ -152,11 +152,11 @@ ExternalData_add_test(VTKData --color-by-mag=1 ) ExternalData_add_test(VTKData - NAME ${vtk-module}Cxx-SurfaceLICCurvedContrastEnhancedColorBlendedSmallGrain - COMMAND ${vtk-module}CxxTests TestSurfaceLIC + NAME vtkRenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedColorBlendedSmallGrain + COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC -D ${VTK_TEST_DATA_DIR} -T ${VTK_TEST_OUTPUT_DIR} - -V "DATA{${${vtk-module}_SOURCE_DIR}/Testing/Data/Baseline/TestSurfaceLICCurvedContrastEnhancedColorBlendedSmallGrain.png,:}" + -V "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TestSurfaceLICCurvedContrastEnhancedColorBlendedSmallGrain.png,:}" --camera-config=1 --data=${VTK_TEST_DATA_DIR}/Data/disk_out_ref_surface.vtp --vectors=V @@ -172,11 +172,11 @@ ExternalData_add_test(VTKData --lic-intensity=0.6 ) ExternalData_add_test(VTKData - NAME ${vtk-module}Cxx-SurfaceLICCurvedContrastEnhancedColorMappedSmallGrain - COMMAND ${vtk-module}CxxTests TestSurfaceLIC + NAME vtkRenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedColorMappedSmallGrain + COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC -D ${VTK_TEST_DATA_DIR} -T ${VTK_TEST_OUTPUT_DIR} - -V "DATA{${${vtk-module}_SOURCE_DIR}/Testing/Data/Baseline/TestSurfaceLICCurvedContrastEnhancedColorMappedSmallGrain.png,:}" + -V "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TestSurfaceLICCurvedContrastEnhancedColorMappedSmallGrain.png,:}" --camera-config=1 --data=${VTK_TEST_DATA_DIR}/Data/disk_out_ref_surface.vtp --vectors=V @@ -191,11 +191,11 @@ ExternalData_add_test(VTKData --color-mode=1 ) ExternalData_add_test(VTKData - NAME ${vtk-module}Cxx-SurfaceLICCurvedContrastEnhancedColorBlendedSmallGrainMask - COMMAND ${vtk-module}CxxTests TestSurfaceLIC + NAME vtkRenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedColorBlendedSmallGrainMask + COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC -D ${VTK_TEST_DATA_DIR} -T ${VTK_TEST_OUTPUT_DIR} - -V "DATA{${${vtk-module}_SOURCE_DIR}/Testing/Data/Baseline/TestSurfaceLICCurvedContrastEnhancedColorBlendedSmallGrainMask.png,:}" + -V "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TestSurfaceLICCurvedContrastEnhancedColorBlendedSmallGrainMask.png,:}" --camera-config=1 --data=${VTK_TEST_DATA_DIR}/Data/disk_out_ref_surface.vtp --vectors=V @@ -213,11 +213,11 @@ ExternalData_add_test(VTKData --mask-color 1.0 1.0 1.0 ) ExternalData_add_test(VTKData - NAME ${vtk-module}Cxx-SurfaceLICCurvedContrastEnhancedColorMappedSmallGrainMask - COMMAND ${vtk-module}CxxTests TestSurfaceLIC + NAME vtkRenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedColorMappedSmallGrainMask + COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC -D ${VTK_TEST_DATA_DIR} -T ${VTK_TEST_OUTPUT_DIR} - -V "DATA{${${vtk-module}_SOURCE_DIR}/Testing/Data/Baseline/TestSurfaceLICCurvedContrastEnhancedColorMappedSmallGrainMask.png,:}" + -V "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TestSurfaceLICCurvedContrastEnhancedColorMappedSmallGrainMask.png,:}" --camera-config=1 --data=${VTK_TEST_DATA_DIR}/Data/disk_out_ref_surface.vtp --vectors=V @@ -236,11 +236,11 @@ ExternalData_add_test(VTKData --mask-color 1.0 1.0 1.0 ) ExternalData_add_test(VTKData - NAME ${vtk-module}Cxx-SurfaceLICCurvedContrastEnhancedSmallGrainMask - COMMAND ${vtk-module}CxxTests TestSurfaceLIC + NAME vtkRenderingLICOpenGL2Cxx-SurfaceLICCurvedContrastEnhancedSmallGrainMask + COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC -D ${VTK_TEST_DATA_DIR} -T ${VTK_TEST_OUTPUT_DIR} - -V "DATA{${${vtk-module}_SOURCE_DIR}/Testing/Data/Baseline/TestSurfaceLICCurvedContrastEnhancedSmallGrainMask.png,:}" + -V "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TestSurfaceLICCurvedContrastEnhancedSmallGrainMask.png,:}" --camera-config=1 --data=${VTK_TEST_DATA_DIR}/Data/disk_out_ref_surface.vtp --vectors=V @@ -259,11 +259,11 @@ ExternalData_add_test(VTKData ) # surface lic on a slice ExternalData_add_test(VTKData - NAME ${vtk-module}Cxx-SurfaceLICPlanarDefaults - COMMAND ${vtk-module}CxxTests TestSurfaceLIC + NAME vtkRenderingLICOpenGL2Cxx-SurfaceLICPlanarDefaults + COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC -D ${VTK_TEST_DATA_DIR} -T ${VTK_TEST_OUTPUT_DIR} - -V "DATA{${${vtk-module}_SOURCE_DIR}/Testing/Data/Baseline/TestSurfaceLICPlanarDefaults.png,:}" + -V "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TestSurfaceLICPlanarDefaults.png,:}" --data=${VTK_TEST_DATA_DIR}/Data/SurfaceVectors.vtk --camera-config=3 --vectors=V @@ -272,11 +272,11 @@ ExternalData_add_test(VTKData --lic-intensity=0.8 ) ExternalData_add_test(VTKData - NAME ${vtk-module}Cxx-SurfaceLICPlanarContrastEnhanced - COMMAND ${vtk-module}CxxTests TestSurfaceLIC + NAME vtkRenderingLICOpenGL2Cxx-SurfaceLICPlanarContrastEnhanced + COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC -D ${VTK_TEST_DATA_DIR} -T ${VTK_TEST_OUTPUT_DIR} - -V "DATA{${${vtk-module}_SOURCE_DIR}/Testing/Data/Baseline/TestSurfaceLICPlanarContrastEnhanced.png,:}" + -V "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TestSurfaceLICPlanarContrastEnhanced.png,:}" --data=${VTK_TEST_DATA_DIR}/Data/SurfaceVectors.vtk --camera-config=3 --vectors=V @@ -286,11 +286,11 @@ ExternalData_add_test(VTKData --color-mode=1 ) ExternalData_add_test(VTKData - NAME ${vtk-module}Cxx-SurfaceLICPlanarVectorNormalizeOff - COMMAND ${vtk-module}CxxTests TestSurfaceLIC + NAME vtkRenderingLICOpenGL2Cxx-SurfaceLICPlanarVectorNormalizeOff + COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC -D ${VTK_TEST_DATA_DIR} -T ${VTK_TEST_OUTPUT_DIR} - -V "DATA{${${vtk-module}_SOURCE_DIR}/Testing/Data/Baseline/TestSurfaceLICPlanarVectorNormalizeOff.png,:}" + -V "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TestSurfaceLICPlanarVectorNormalizeOff.png,:}" --data=${VTK_TEST_DATA_DIR}/Data/SurfaceVectors.vtk --camera-config=3 --vectors=V @@ -307,11 +307,11 @@ ExternalData_add_test(VTKData --color-mode=1 ) ExternalData_add_test(VTKData - NAME ${vtk-module}Cxx-SurfaceLICPlanarVectorNormalizeOffMediumGrainUniform - COMMAND ${vtk-module}CxxTests TestSurfaceLIC + NAME vtkRenderingLICOpenGL2Cxx-SurfaceLICPlanarVectorNormalizeOffMediumGrainUniform + COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC -D ${VTK_TEST_DATA_DIR} -T ${VTK_TEST_OUTPUT_DIR} - -V "DATA{${${vtk-module}_SOURCE_DIR}/Testing/Data/Baseline/TestSurfaceLICPlanarVectorNormalizeOffMediumGrainUniform.png,:}" + -V "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TestSurfaceLICPlanarVectorNormalizeOffMediumGrainUniform.png,:}" --data=${VTK_TEST_DATA_DIR}/Data/SurfaceVectors.vtk --camera-config=3 --vectors=V @@ -329,11 +329,11 @@ ExternalData_add_test(VTKData --color-mode=1 ) ExternalData_add_test(VTKData - NAME ${vtk-module}Cxx-SurfaceLICPlanarVectorNormalizeOffMediumGrainPerlin - COMMAND ${vtk-module}CxxTests TestSurfaceLIC + NAME vtkRenderingLICOpenGL2Cxx-SurfaceLICPlanarVectorNormalizeOffMediumGrainPerlin + COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC -D ${VTK_TEST_DATA_DIR} -T ${VTK_TEST_OUTPUT_DIR} - -V "DATA{${${vtk-module}_SOURCE_DIR}/Testing/Data/Baseline/TestSurfaceLICPlanarVectorNormalizeOffMediumGrainPerlin.png,:}" + -V "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TestSurfaceLICPlanarVectorNormalizeOffMediumGrainPerlin.png,:}" --data=${VTK_TEST_DATA_DIR}/Data/SurfaceVectors.vtk --camera-config=3 --vectors=V @@ -351,11 +351,11 @@ ExternalData_add_test(VTKData --anti-alias=1 ) ExternalData_add_test(VTKData - NAME ${vtk-module}Cxx-SurfaceLICMultiBlockContrastEnhancedPerlin - COMMAND ${vtk-module}CxxTests TestSurfaceLIC + NAME vtkRenderingLICOpenGL2Cxx-SurfaceLICMultiBlockContrastEnhancedPerlin + COMMAND vtkRenderingLICOpenGL2CxxTests TestSurfaceLIC -D ${VTK_TEST_DATA_DIR} -T ${VTK_TEST_OUTPUT_DIR} - -V "DATA{${${vtk-module}_SOURCE_DIR}/Testing/Data/Baseline/TestSurfaceLICMultiBlockContrastEnhancedPerlin.png,:}" + -V "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TestSurfaceLICMultiBlockContrastEnhancedPerlin.png,:}" --data=${VTK_TEST_DATA_DIR}/Data/ex-blow_5.vtm --camera-config=4 --vectors=DISPLACEMENT_ diff --git a/Rendering/LOD/Testing/Cxx/CMakeLists.txt b/Rendering/LOD/Testing/Cxx/CMakeLists.txt index 56b8c65c8c6c4f836bd6a3971d8b994478a63907..c1288e233e0e1008171829b497b85be1921abfce 100644 --- a/Rendering/LOD/Testing/Cxx/CMakeLists.txt +++ b/Rendering/LOD/Testing/Cxx/CMakeLists.txt @@ -1,4 +1,4 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkRenderingLODCxxTests tests TestLODActor.cxx,NO_VALID ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkRenderingLODCxxTests tests) diff --git a/Rendering/Label/Testing/Cxx/CMakeLists.txt b/Rendering/Label/Testing/Cxx/CMakeLists.txt index fc6210e2787096170bac288f24618d075d838331..95c84f8b1b2f073a59ed4886112b5a8e97336e2c 100644 --- a/Rendering/Label/Testing/Cxx/CMakeLists.txt +++ b/Rendering/Label/Testing/Cxx/CMakeLists.txt @@ -1,4 +1,4 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkRenderingLabelCxxTests tests TestClipLabels.cxx TestDynamic2DLabelMapper.cxx TestLabelPlacer.cxx @@ -8,4 +8,4 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests TestLabelPlacementMapper2D.cxx TestLabelPlacementMapperCoincidentPoints.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkRenderingLabelCxxTests tests) diff --git a/Rendering/Matplotlib/Testing/Cxx/CMakeLists.txt b/Rendering/Matplotlib/Testing/Cxx/CMakeLists.txt index d4609df38b834c6c3add4474ba2db98e381dccc2..2b645b60eb384ccaedcf89a131f8c21531ab073b 100644 --- a/Rendering/Matplotlib/Testing/Cxx/CMakeLists.txt +++ b/Rendering/Matplotlib/Testing/Cxx/CMakeLists.txt @@ -10,7 +10,7 @@ endif() if(MATPLOTLIB_FOUND) # add tests that require data - vtk_add_test_cxx(${vtk-module}CxxTests tests + vtk_add_test_cxx(vtkRenderingMatplotlibCxxTests tests TestContextMathTextImage.cxx TestMathTextActor.cxx TestMathTextActor3D.cxx @@ -22,7 +22,7 @@ if(MATPLOTLIB_FOUND) if(VTK_GHOSTSCRIPT_EXECUTABLE) set(TestGL2PSFontDPIScaling_ARGS DATA{../Data/Fonts/DejaVuSans.ttf}) - vtk_add_test_cxx(${vtk-module}CxxTests GL2PSTests + vtk_add_test_cxx(vtkRenderingMatplotlibCxxTests GL2PSTests TestGL2PSFontDPIScaling.cxx TestGL2PSMathTextActor.cxx TestGL2PSMathTextActor3D.cxx @@ -33,7 +33,7 @@ if(MATPLOTLIB_FOUND) ${GL2PSTests}) endif() - vtk_test_cxx_executable(${vtk-module}CxxTests tests + vtk_test_cxx_executable(vtkRenderingMatplotlibCxxTests tests RENDERING_FACTORY) endif() diff --git a/Rendering/OSPRay/Testing/Cxx/CMakeLists.txt b/Rendering/OSPRay/Testing/Cxx/CMakeLists.txt index 0a75dcbfd93c891b15ebdf215a5ea8af8ea15a59..3baa4cd6827a4817f2c211950af719d7d7a099d9 100644 --- a/Rendering/OSPRay/Testing/Cxx/CMakeLists.txt +++ b/Rendering/OSPRay/Testing/Cxx/CMakeLists.txt @@ -1,4 +1,4 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkRenderingOSPRayCxxTests tests # Surface rendering tests TestOSPRayAmbient.cxx TestOSPRayAMRVolumeRenderer.cxx @@ -43,7 +43,7 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests TestPathTracerShadows.cxx TestOSPRayTetrahedraMapper.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests RENDERING_FACTORY +vtk_test_cxx_executable(vtkRenderingOSPRayCxxTests tests RENDERING_FACTORY vtkOSPRayTestInteractor.cxx ) @@ -60,16 +60,16 @@ if (${Module_vtkRenderingParallel} AND ${Module_vtkParallelMPI}) ) include(vtkMPI) - set(${vtk-module}Cxx-MPI_NUMPROCS 2) - vtk_add_test_mpi(${vtk-module}Cxx-MPI tests + set(vtkRenderingOSPRayCxx-MPI_NUMPROCS 2) + vtk_add_test_mpi(vtkRenderingOSPRayCxx-MPI tests TESTING_DATA TestOSPRayComposite.cxx ) - vtk_test_mpi_executable(${vtk-module}Cxx-MPI tests RENDERING_FACTORY + vtk_test_mpi_executable(vtkRenderingOSPRayCxx-MPI tests RENDERING_FACTORY vtkOSPRayTestInteractor.cxx ) - target_link_libraries(${vtk-module}Cxx-MPI PRIVATE + target_link_libraries(vtkRenderingOSPRayCxx-MPI PRIVATE ${vtkRenderingParallel_LIBRARIES} ${vtkParallelMPI_LIBRARIES} ) diff --git a/Rendering/Oculus/Testing/Cxx/CMakeLists.txt b/Rendering/Oculus/Testing/Cxx/CMakeLists.txt index d301c45eba99670bc53ee905418de3bccad36eef..d7f1fdcf95a3ed26d429e0bf478273f488837a32 100644 --- a/Rendering/Oculus/Testing/Cxx/CMakeLists.txt +++ b/Rendering/Oculus/Testing/Cxx/CMakeLists.txt @@ -1,5 +1,5 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkRenderingOculusCxxTests tests TestDragon.cxx,NO_VALID ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests RENDERING_FACTORY) +vtk_test_cxx_executable(vtkRenderingOculusCxxTests tests RENDERING_FACTORY) diff --git a/Rendering/OpenGL2/Testing/Cxx/CMakeLists.txt b/Rendering/OpenGL2/Testing/Cxx/CMakeLists.txt index ed2ac6728852de6fceb4cb15a060ffa21ecf28bd..ff8d95335da3655ae9fdf5bef03044e3dda02840 100644 --- a/Rendering/OpenGL2/Testing/Cxx/CMakeLists.txt +++ b/Rendering/OpenGL2/Testing/Cxx/CMakeLists.txt @@ -1,4 +1,4 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkRenderingOpenGL2CxxTests tests TestAppleBug.cxx TestBlurAndSobelPasses.cxx TestCoincident.cxx @@ -44,8 +44,8 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests TestValuePass2.cxx ) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkRenderingOpenGL2CxxTests tests TestCubeMap2.cxx "DATA{${VTK_TEST_INPUT_DIR}/skybox/,REGEX:.*}") -vtk_test_cxx_executable(${vtk-module}CxxTests tests RENDERING_FACTORY) +vtk_test_cxx_executable(vtkRenderingOpenGL2CxxTests tests RENDERING_FACTORY) diff --git a/Rendering/OpenVR/Testing/Cxx/CMakeLists.txt b/Rendering/OpenVR/Testing/Cxx/CMakeLists.txt index c4ab525a634d7d8c38c71ad758b448c4c24eb4bd..9bc37ae0f1fcc468a7265027b0cfdf348ac92207 100644 --- a/Rendering/OpenVR/Testing/Cxx/CMakeLists.txt +++ b/Rendering/OpenVR/Testing/Cxx/CMakeLists.txt @@ -1,6 +1,6 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkRenderingOpenVRCxxTests tests TestDragon.cxx,NO_VALID # Medical.cxx,NO_VALID ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests RENDERING_FACTORY) +vtk_test_cxx_executable(vtkRenderingOpenVRCxxTests tests RENDERING_FACTORY) diff --git a/Rendering/OptiX/Testing/Cxx/CMakeLists.txt b/Rendering/OptiX/Testing/Cxx/CMakeLists.txt index 0356ba44220637faf2d36e229c5d6534d2202bfc..b6e9068c9553f7032f335beb4a02a65ffa239df3 100644 --- a/Rendering/OptiX/Testing/Cxx/CMakeLists.txt +++ b/Rendering/OptiX/Testing/Cxx/CMakeLists.txt @@ -7,7 +7,7 @@ include_directories( "${CUDA_INCLUDE_DIRS}" ) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkRenderingOptiXCxxTests tests TestOptiXCompositePolyDataMapper2.cxx, TestOptiXDynamicObject.cxx, TestOptiXDynamicScene.cxx, @@ -22,7 +22,7 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests TestOptiXTime.cxx, TestOptiXWindow.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests RENDERING_FACTORY +vtk_test_cxx_executable(vtkRenderingOptiXCxxTests tests RENDERING_FACTORY vtkOptiXTestInteractor.cxx ) @@ -38,16 +38,16 @@ if (${Module_vtkRenderingParallel} AND ${Module_vtkParallelMPI}) ) include(vtkMPI) - set(${vtk-module}Cxx-MPI_NUMPROCS 2) - vtk_add_test_mpi(${vtk-module}Cxx-MPI tests + set(vtkRenderingOptiXCxx-MPI_NUMPROCS 2) + vtk_add_test_mpi(vtkRenderingOptiXCxx-MPI tests TESTING_DATA TestOptiXComposite.cxx ) - vtk_test_mpi_executable(${vtk-module}Cxx-MPI tests RENDERING_FACTORY + vtk_test_mpi_executable(vtkRenderingOptiXCxx-MPI tests RENDERING_FACTORY vtkOptiXTestInteractor.cxx ) - target_link_libraries(${vtk-module}Cxx-MPI PRIVATE + target_link_libraries(vtkRenderingOptiXCxx-MPI PRIVATE ${vtkRenderingParallel_LIBRARIES} ${vtkParallelMPI_LIBRARIES} ) diff --git a/Rendering/Parallel/Testing/Cxx/CMakeLists.txt b/Rendering/Parallel/Testing/Cxx/CMakeLists.txt index 2c068faf24dd09a7d7dd849cbdf19f1edcb7def6..c7c341c1f3562e6a0b9866c42a894ad53b032ad2 100644 --- a/Rendering/Parallel/Testing/Cxx/CMakeLists.txt +++ b/Rendering/Parallel/Testing/Cxx/CMakeLists.txt @@ -1,11 +1,11 @@ include(vtkMPI) -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkRenderingParallelCxxTests tests PrmMagnify.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkRenderingParallelCxxTests tests) -vtk_add_test_mpi(${vtk-module}CxxTests-MPI tests +vtk_add_test_mpi(vtkRenderingParallelCxxTests-MPI tests TestSimplePCompositeZPass.cxx,TESTING_DATA TestParallelRendering.cxx,TESTING_DATA ) @@ -14,26 +14,26 @@ set(all_tests ${tests} ${no_data_tests} ) -vtk_test_mpi_executable(${vtk-module}CxxTests-MPI all_tests) +vtk_test_mpi_executable(vtkRenderingParallelCxxTests-MPI all_tests) if (PYTHON_EXECUTABLE) vtk_module_test_executable( - ${vtk-module}-TestClientServerRendering TestClientServerRendering.cxx) + vtkRenderingParallel-TestClientServerRendering TestClientServerRendering.cxx) ExternalData_add_test(VTKData - NAME ${vtk-module}-TestClientServerRendering + NAME vtkRenderingParallel-TestClientServerRendering COMMAND ${PYTHON_EXECUTABLE} ${VTK_CMAKE_DIR}/vtkTestDriver.py --process - $ + $ --port 12367 --server -D ${VTK_TEST_DATA_DIR} --process - $ + $ --port 12367 -D ${VTK_TEST_DATA_DIR} -T ${VTK_TEST_OUTPUT_DIR} - -V "DATA{${${vtk-module}_SOURCE_DIR}/Testing/Data/Baseline/TestClientServerRendering.png,:}" + -V "DATA{${CMAKE_CURRENT_SOURCE_DIR}/../Data/Baseline/TestClientServerRendering.png,:}" ) endif() diff --git a/Rendering/SceneGraph/Testing/Cxx/CMakeLists.txt b/Rendering/SceneGraph/Testing/Cxx/CMakeLists.txt index 124c870262831b1a2f93f31bcf4c4abe2acb10b3..5502573ec402d394c6841816d65cac5bb7cddb04 100644 --- a/Rendering/SceneGraph/Testing/Cxx/CMakeLists.txt +++ b/Rendering/SceneGraph/Testing/Cxx/CMakeLists.txt @@ -1,5 +1,5 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkRenderingSceneGraphCxxTests tests UnitTests.cxx,NO_DATA,NO_VALID,NO_OUTPUT ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests) +vtk_test_cxx_executable(vtkRenderingSceneGraphCxxTests tests) diff --git a/Rendering/Volume/Testing/Cxx/CMakeLists.txt b/Rendering/Volume/Testing/Cxx/CMakeLists.txt index e25c101b6d35603d7bdbb61e202182774dcfa586..8b34f657db4297dd219590fc77dbe7294657ffb9 100644 --- a/Rendering/Volume/Testing/Cxx/CMakeLists.txt +++ b/Rendering/Volume/Testing/Cxx/CMakeLists.txt @@ -97,11 +97,11 @@ endforeach() include_directories(${CMAKE_CURRENT_BINARY_DIR}) # everyone gets these tests -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkRenderingVolumeCxxTests tests ${VolumeCxxTests} ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests +vtk_test_cxx_executable(vtkRenderingVolumeCxxTests tests RENDERING_FACTORY ${shader_c_files} ) diff --git a/Views/Infovis/Testing/Cxx/CMakeLists.txt b/Views/Infovis/Testing/Cxx/CMakeLists.txt index ab8370cea2b36e83a8a0cbab35568b42ef02643d..42ef2513601545c0400efd88c988ab5740455def 100644 --- a/Views/Infovis/Testing/Cxx/CMakeLists.txt +++ b/Views/Infovis/Testing/Cxx/CMakeLists.txt @@ -1,4 +1,4 @@ -vtk_add_test_cxx(${vtk-module}CxxTests tests +vtk_add_test_cxx(vtkViewsInfovisCxxTests tests TestConeLayoutStrategy.cxx TestCoincidentGraphLayoutView.cxx TestColumnTree.cxx @@ -22,5 +22,5 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests TestTreeRingView.cxx ) -vtk_test_cxx_executable(${vtk-module}CxxTests tests +vtk_test_cxx_executable(vtkViewsInfovisCxxTests tests RENDERING_FACTORY)