From 24e0b7b7a8d0fe5106286b253a8e9e83efbbc1a7 Mon Sep 17 00:00:00 2001 From: bruneton Date: Tue, 9 Jul 2013 10:09:27 +0000 Subject: [PATCH] CMake: replacing CMAKE_* variables by PROJECT_* variabls --- CMakeLists.txt | 4 +-- idl/CMakeLists.txt | 24 ++++++++--------- src/ENGINE/CMakeLists.txt | 2 +- src/Macro/CMakeLists.txt | 2 +- src/PVGUI/CMakeLists.txt | 26 +++++++++---------- src/Plugins/MedReader/IO/CMakeLists.txt | 2 +- test/VisuPrs/2D_viewer/CMakeLists.txt | 2 +- test/VisuPrs/3D_viewer/CMakeLists.txt | 2 +- test/VisuPrs/Animation/CMakeLists.txt | 2 +- test/VisuPrs/CutLines/CMakeLists.txt | 2 +- test/VisuPrs/CutPlanes/CMakeLists.txt | 2 +- test/VisuPrs/DeformedShape/CMakeLists.txt | 2 +- test/VisuPrs/GaussPoints/CMakeLists.txt | 2 +- test/VisuPrs/IsoSurfaces/CMakeLists.txt | 2 +- test/VisuPrs/MeshPresentation/CMakeLists.txt | 2 +- test/VisuPrs/Plot3D/CMakeLists.txt | 2 +- test/VisuPrs/SWIG_scripts/CMakeLists.txt | 2 +- test/VisuPrs/ScalarMap/CMakeLists.txt | 2 +- .../ScalarMap_On_DeformedShape/CMakeLists.txt | 2 +- test/VisuPrs/StreamLines/CMakeLists.txt | 2 +- test/VisuPrs/Tables/CMakeLists.txt | 2 +- test/VisuPrs/Vectors/CMakeLists.txt | 2 +- 22 files changed, 46 insertions(+), 46 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f6b0baf7..c1690f5c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,7 +36,7 @@ SET(MODULE PARAVIS) SET(CMAKE_MODULE_PATH "${KERNEL_ROOT_DIR}/salome_adm/cmake_files" "${GUI_ROOT_DIR}/adm_local/cmake_files" - "${CMAKE_SOURCE_DIR}/adm_local/cmake_files") + "${PROJECT_SOURCE_DIR}/adm_local/cmake_files") INCLUDE(SalomeMacros) INCLUDE(SalomeSetupPlatform) @@ -101,7 +101,7 @@ INCLUDE(${MED_ROOT_DIR}/adm_local/cmake_files/FindMED.cmake) # TODO: the below requires ParaView in the PYTHONPATH ... not so nice: MESSAGE(STATUS "Generating wrapped class list (??) ...") LIST(GET PARAVIEW_INCLUDE_DIRS 0 PARAVIEW_INCLUDE_DIR0) -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/getwrapclasses.py ${PARAVIEW_INCLUDE_DIR0}) +EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/getwrapclasses.py ${PARAVIEW_INCLUDE_DIR0}) SET(SUBDIRS idl diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt index ecf37a99..091c6a4a 100644 --- a/idl/CMakeLists.txt +++ b/idl/CMakeLists.txt @@ -21,7 +21,7 @@ SET(VERSION_INFO ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MAINTENANCE}) SET(SOVERSION_INFO ${VERSION_MAJOR}.${VERSION_MINOR}) ADD_DEFINITIONS(-DHAVE_SALOME_CONFIG) -INCLUDE_DIRECTORIES(${OMNIORB_INCLUDE_DIR} ${KERNEL_ROOT_DIR}/include/salome ${CMAKE_BINARY_DIR}/idl) +INCLUDE_DIRECTORIES(${OMNIORB_INCLUDE_DIR} ${KERNEL_ROOT_DIR}/include/salome ${PROJECT_BINARY_DIR}/idl) INCLUDE(wrap.cmake) @@ -66,23 +66,23 @@ TARGET_LINK_LIBRARIES(SalomeIDLPARAVIS ${PLATFORM_LIBADD} ${PLATFORM_LDFLAGS} ${ INSTALL(TARGETS SalomeIDLPARAVIS DESTINATION lib/salome) ADD_EXECUTABLE(vtkWrapIDL - ${CMAKE_SOURCE_DIR}/src/ParaView/vtkParse.tab.c - ${CMAKE_SOURCE_DIR}/src/ParaView/vtkParsePreprocess.c - ${CMAKE_SOURCE_DIR}/src/ParaView/vtkParseHierarchy.c - ${CMAKE_SOURCE_DIR}/src/ParaView/vtkParseExtras.c - ${CMAKE_SOURCE_DIR}/src/ParaView/vtkParseMain.c - ${CMAKE_SOURCE_DIR}/src/ParaView/vtkParseData.c - ${CMAKE_SOURCE_DIR}/src/ParaView/vtkParseString.c - ${CMAKE_SOURCE_DIR}/src/ParaView/vtkWrap.c -# ${CMAKE_SOURCE_DIR}/src/ParaView/vtkWrapText.c + ${PROJECT_SOURCE_DIR}/src/ParaView/vtkParse.tab.c + ${PROJECT_SOURCE_DIR}/src/ParaView/vtkParsePreprocess.c + ${PROJECT_SOURCE_DIR}/src/ParaView/vtkParseHierarchy.c + ${PROJECT_SOURCE_DIR}/src/ParaView/vtkParseExtras.c + ${PROJECT_SOURCE_DIR}/src/ParaView/vtkParseMain.c + ${PROJECT_SOURCE_DIR}/src/ParaView/vtkParseData.c + ${PROJECT_SOURCE_DIR}/src/ParaView/vtkParseString.c + ${PROJECT_SOURCE_DIR}/src/ParaView/vtkWrap.c +# ${PROJECT_SOURCE_DIR}/src/ParaView/vtkWrapText.c ${CMAKE_CURRENT_SOURCE_DIR}/vtkWrapIDL.c) -set_property(SOURCE ${CMAKE_SOURCE_DIR}/src/ParaView/vtkParseMain.c PROPERTY COMPILE_DEFINITIONS +set_property(SOURCE ${PROJECT_SOURCE_DIR}/src/ParaView/vtkParseMain.c PROPERTY COMPILE_DEFINITIONS VTK_PARSE_VERSION="${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}") ADD_DEPENDENCIES(vtkWrapIDL generate_txt) -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/ParaView) +INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/ParaView) SET(flags) FOREACH(f ${PLATFORM_CPPFLAGS} ${PTHREAD_CFLAGS} ${PARAVIEW_INCLUDES} ${VTK_INCLUDES}) SET(flags "${flags} ${f}") diff --git a/src/ENGINE/CMakeLists.txt b/src/ENGINE/CMakeLists.txt index 6c46b5cc..7bb220cd 100644 --- a/src/ENGINE/CMakeLists.txt +++ b/src/ENGINE/CMakeLists.txt @@ -21,7 +21,7 @@ SET(VERSION_INFO ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MAINTENANCE}) SET(SOVERSION_INFO ${VERSION_MAJOR}.${VERSION_MINOR}) ADD_DEFINITIONS(-DHAVE_SALOME_CONFIG) -INCLUDE_DIRECTORIES(${OMNIORB_INCLUDE_DIR} ${KERNEL_ROOT_DIR}/include/salome ${CMAKE_BINARY_DIR}/idl) +INCLUDE_DIRECTORIES(${OMNIORB_INCLUDE_DIR} ${KERNEL_ROOT_DIR}/include/salome ${PROJECT_BINARY_DIR}/idl) ADD_LIBRARY(PARAVISEngine SHARED PARAVIS_Engine_i.cc) diff --git a/src/Macro/CMakeLists.txt b/src/Macro/CMakeLists.txt index 7dd41f2c..3562651f 100644 --- a/src/Macro/CMakeLists.txt +++ b/src/Macro/CMakeLists.txt @@ -19,7 +19,7 @@ #FILE(GLOB copy_FILES "*py") #INSTALL(FILES ${copy_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/salome/Macros) -INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/Macro +INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR}/src/Macro DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/salome FILES_MATCHING PATTERN "*.py" PATTERN "CVS" EXCLUDE diff --git a/src/PVGUI/CMakeLists.txt b/src/PVGUI/CMakeLists.txt index 9b314649..34881a10 100644 --- a/src/PVGUI/CMakeLists.txt +++ b/src/PVGUI/CMakeLists.txt @@ -26,8 +26,8 @@ INCLUDE_DIRECTORIES(${OMNIORB_INCLUDE_DIR} ${KERNEL_ROOT_DIR}/include/salome ${GUI_ROOT_DIR}/include/salome ${CMAKE_CURRENT_SOURCE_DIR}/../ParaView - ${CMAKE_BINARY_DIR}/idl - ${CMAKE_BINARY_DIR} + ${PROJECT_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CAS_INCLUDE_DIRS} ) @@ -198,19 +198,19 @@ INSTALL(TARGETS PARAVIS DESTINATION lib/salome) FOREACH(name ${bin_PROGRAMS}) ADD_EXECUTABLE(${name} - ${CMAKE_SOURCE_DIR}/src/ParaView/vtkParse.tab.c - ${CMAKE_SOURCE_DIR}/src/ParaView/vtkParsePreprocess.c - ${CMAKE_SOURCE_DIR}/src/ParaView/vtkParseHierarchy.c - ${CMAKE_SOURCE_DIR}/src/ParaView/vtkParseExtras.c - ${CMAKE_SOURCE_DIR}/src/ParaView/vtkParseMain.c - ${CMAKE_SOURCE_DIR}/src/ParaView/vtkParseData.c - ${CMAKE_SOURCE_DIR}/src/ParaView/vtkParseString.c - ${CMAKE_SOURCE_DIR}/src/ParaView/vtkWrap.c -# ${CMAKE_SOURCE_DIR}/src/ParaView/vtkWrapText.c - ${CMAKE_SOURCE_DIR}/idl/vtkWrapIDL.c) + ${PROJECT_SOURCE_DIR}/src/ParaView/vtkParse.tab.c + ${PROJECT_SOURCE_DIR}/src/ParaView/vtkParsePreprocess.c + ${PROJECT_SOURCE_DIR}/src/ParaView/vtkParseHierarchy.c + ${PROJECT_SOURCE_DIR}/src/ParaView/vtkParseExtras.c + ${PROJECT_SOURCE_DIR}/src/ParaView/vtkParseMain.c + ${PROJECT_SOURCE_DIR}/src/ParaView/vtkParseData.c + ${PROJECT_SOURCE_DIR}/src/ParaView/vtkParseString.c + ${PROJECT_SOURCE_DIR}/src/ParaView/vtkWrap.c +# ${PROJECT_SOURCE_DIR}/src/ParaView/vtkWrapText.c + ${PROJECT_SOURCE_DIR}/idl/vtkWrapIDL.c) ADD_DEPENDENCIES(${name} generate_txt) - set_property(SOURCE ${CMAKE_SOURCE_DIR}/src/ParaView/vtkParseMain.c PROPERTY COMPILE_DEFINITIONS + set_property(SOURCE ${PROJECT_SOURCE_DIR}/src/ParaView/vtkParseMain.c PROPERTY COMPILE_DEFINITIONS VTK_PARSE_VERSION="${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}") SET(flags) diff --git a/src/Plugins/MedReader/IO/CMakeLists.txt b/src/Plugins/MedReader/IO/CMakeLists.txt index 58fd1949..75c31530 100644 --- a/src/Plugins/MedReader/IO/CMakeLists.txt +++ b/src/Plugins/MedReader/IO/CMakeLists.txt @@ -83,7 +83,7 @@ set_source_files_properties( vtk_module_library(vtkMedReader ${MedReader_SRCS}) # Introducing selection for parallel compilation -# CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/IO/config.h.cmake ${CMAKE_SOURCE_DIR}/IO/config.h ) +# CONFIGURE_FILE( ${PROJECT_SOURCE_DIR}/IO/config.h.cmake ${PROJECT_SOURCE_DIR}/IO/config.h ) CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h ) target_link_libraries(vtkMedReader ${MED_LIBRARIES}) diff --git a/test/VisuPrs/2D_viewer/CMakeLists.txt b/test/VisuPrs/2D_viewer/CMakeLists.txt index 0c9b9d82..d5372e2d 100644 --- a/test/VisuPrs/2D_viewer/CMakeLists.txt +++ b/test/VisuPrs/2D_viewer/CMakeLists.txt @@ -23,7 +23,7 @@ IF (PYTHON_EXECUTABLE) A1 ) SET(TIMEOUT 10000) - ADD_TEST(2DVIEWER_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) + ADD_TEST(2DVIEWER_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) SET_TESTS_PROPERTIES(2DVIEWER_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) ENDFOREACH( tfile ) ENDIF (PYTHON_EXECUTABLE) diff --git a/test/VisuPrs/3D_viewer/CMakeLists.txt b/test/VisuPrs/3D_viewer/CMakeLists.txt index 532b99a8..973d356b 100755 --- a/test/VisuPrs/3D_viewer/CMakeLists.txt +++ b/test/VisuPrs/3D_viewer/CMakeLists.txt @@ -32,7 +32,7 @@ IF (PYTHON_EXECUTABLE) B2 ) SET(TIMEOUT 10000) - ADD_TEST(3DVIEWER_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) + ADD_TEST(3DVIEWER_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) SET_TESTS_PROPERTIES(3DVIEWER_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) ENDFOREACH( tfile ) ENDIF (PYTHON_EXECUTABLE) diff --git a/test/VisuPrs/Animation/CMakeLists.txt b/test/VisuPrs/Animation/CMakeLists.txt index 45d16321..3a4e12ab 100755 --- a/test/VisuPrs/Animation/CMakeLists.txt +++ b/test/VisuPrs/Animation/CMakeLists.txt @@ -50,7 +50,7 @@ IF (PYTHON_EXECUTABLE) H2 ) SET(TIMEOUT 10000) - ADD_TEST(ANIMATION_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) + ADD_TEST(ANIMATION_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) SET_TESTS_PROPERTIES(ANIMATION_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) ENDFOREACH( tfile ) ENDIF (PYTHON_EXECUTABLE) diff --git a/test/VisuPrs/CutLines/CMakeLists.txt b/test/VisuPrs/CutLines/CMakeLists.txt index 180d91a2..ad8dd3da 100644 --- a/test/VisuPrs/CutLines/CMakeLists.txt +++ b/test/VisuPrs/CutLines/CMakeLists.txt @@ -57,7 +57,7 @@ IF (PYTHON_EXECUTABLE) G2 ) SET(TIMEOUT 10000) - ADD_TEST(CUTLINES_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) + ADD_TEST(CUTLINES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) SET_TESTS_PROPERTIES(CUTLINES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) ENDFOREACH( tfile ) ENDIF (PYTHON_EXECUTABLE) diff --git a/test/VisuPrs/CutPlanes/CMakeLists.txt b/test/VisuPrs/CutPlanes/CMakeLists.txt index 008f04cd..f48e2a8a 100644 --- a/test/VisuPrs/CutPlanes/CMakeLists.txt +++ b/test/VisuPrs/CutPlanes/CMakeLists.txt @@ -57,7 +57,7 @@ IF (PYTHON_EXECUTABLE) G2 ) SET(TIMEOUT 10000) - ADD_TEST(CUTPLANES_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) + ADD_TEST(CUTPLANES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) SET_TESTS_PROPERTIES(CUTPLANES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) ENDFOREACH( tfile ) ENDIF (PYTHON_EXECUTABLE) diff --git a/test/VisuPrs/DeformedShape/CMakeLists.txt b/test/VisuPrs/DeformedShape/CMakeLists.txt index 0a54ca34..cbff4753 100644 --- a/test/VisuPrs/DeformedShape/CMakeLists.txt +++ b/test/VisuPrs/DeformedShape/CMakeLists.txt @@ -55,7 +55,7 @@ IF (PYTHON_EXECUTABLE) F9 ) SET(TIMEOUT 10000) - ADD_TEST(DEFORMEDSHAPE_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) + ADD_TEST(DEFORMEDSHAPE_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) SET_TESTS_PROPERTIES(DEFORMEDSHAPE_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) ENDFOREACH( tfile ) ENDIF (PYTHON_EXECUTABLE) diff --git a/test/VisuPrs/GaussPoints/CMakeLists.txt b/test/VisuPrs/GaussPoints/CMakeLists.txt index e2a0317f..19a1bf82 100644 --- a/test/VisuPrs/GaussPoints/CMakeLists.txt +++ b/test/VisuPrs/GaussPoints/CMakeLists.txt @@ -48,7 +48,7 @@ IF (PYTHON_EXECUTABLE) C7 ) SET(TIMEOUT 10000) - ADD_TEST(GAUSSPOINTS_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) + ADD_TEST(GAUSSPOINTS_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) SET_TESTS_PROPERTIES(GAUSSPOINTS_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) ENDFOREACH( tfile ) ENDIF (PYTHON_EXECUTABLE) diff --git a/test/VisuPrs/IsoSurfaces/CMakeLists.txt b/test/VisuPrs/IsoSurfaces/CMakeLists.txt index d936dea5..6b891f0c 100755 --- a/test/VisuPrs/IsoSurfaces/CMakeLists.txt +++ b/test/VisuPrs/IsoSurfaces/CMakeLists.txt @@ -56,7 +56,7 @@ IF (PYTHON_EXECUTABLE) G2 ) SET(TIMEOUT 10000) - ADD_TEST(ISOSURFACES_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) + ADD_TEST(ISOSURFACES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) SET_TESTS_PROPERTIES(ISOSURFACES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) ENDFOREACH( tfile ) ENDIF (PYTHON_EXECUTABLE) diff --git a/test/VisuPrs/MeshPresentation/CMakeLists.txt b/test/VisuPrs/MeshPresentation/CMakeLists.txt index 623b9de7..4add8454 100644 --- a/test/VisuPrs/MeshPresentation/CMakeLists.txt +++ b/test/VisuPrs/MeshPresentation/CMakeLists.txt @@ -104,7 +104,7 @@ IF (PYTHON_EXECUTABLE) L1 ) SET(TIMEOUT 10000) - ADD_TEST(MESH_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) + ADD_TEST(MESH_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) SET_TESTS_PROPERTIES(MESH_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) ENDFOREACH( tfile ) ENDIF (PYTHON_EXECUTABLE) diff --git a/test/VisuPrs/Plot3D/CMakeLists.txt b/test/VisuPrs/Plot3D/CMakeLists.txt index b7373cd9..eb53d51f 100755 --- a/test/VisuPrs/Plot3D/CMakeLists.txt +++ b/test/VisuPrs/Plot3D/CMakeLists.txt @@ -56,7 +56,7 @@ IF (PYTHON_EXECUTABLE) G2 ) SET(TIMEOUT 10000) - ADD_TEST(PLOT3D_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) + ADD_TEST(PLOT3D_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) SET_TESTS_PROPERTIES(PLOT3D_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) ENDFOREACH( tfile ) ENDIF (PYTHON_EXECUTABLE) diff --git a/test/VisuPrs/SWIG_scripts/CMakeLists.txt b/test/VisuPrs/SWIG_scripts/CMakeLists.txt index 1fb2b9af..67fef0b3 100644 --- a/test/VisuPrs/SWIG_scripts/CMakeLists.txt +++ b/test/VisuPrs/SWIG_scripts/CMakeLists.txt @@ -38,7 +38,7 @@ IF (PYTHON_EXECUTABLE) C7 ) SET(TIMEOUT 10000) - ADD_TEST(SWIGSCRIPTS_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) + ADD_TEST(SWIGSCRIPTS_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) SET_TESTS_PROPERTIES(SWIGSCRIPTS_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) ENDFOREACH( tfile ) ENDIF (PYTHON_EXECUTABLE) diff --git a/test/VisuPrs/ScalarMap/CMakeLists.txt b/test/VisuPrs/ScalarMap/CMakeLists.txt index f6d8942c..7cdc4ba4 100644 --- a/test/VisuPrs/ScalarMap/CMakeLists.txt +++ b/test/VisuPrs/ScalarMap/CMakeLists.txt @@ -56,7 +56,7 @@ IF (PYTHON_EXECUTABLE) G2 ) SET(TIMEOUT 10000) - ADD_TEST(SCALARMAP_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) + ADD_TEST(SCALARMAP_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) SET_TESTS_PROPERTIES(SCALARMAP_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) ENDFOREACH( tfile ) ENDIF (PYTHON_EXECUTABLE) diff --git a/test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt b/test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt index 3706661f..40981a9a 100644 --- a/test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt +++ b/test/VisuPrs/ScalarMap_On_DeformedShape/CMakeLists.txt @@ -53,7 +53,7 @@ IF (PYTHON_EXECUTABLE) F8 ) SET(TIMEOUT 10000) - ADD_TEST(DEFORMEDSHAPESCALARMAP_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) + ADD_TEST(DEFORMEDSHAPESCALARMAP_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) SET_TESTS_PROPERTIES(DEFORMEDSHAPESCALARMAP_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) ENDFOREACH( tfile ) ENDIF (PYTHON_EXECUTABLE) diff --git a/test/VisuPrs/StreamLines/CMakeLists.txt b/test/VisuPrs/StreamLines/CMakeLists.txt index 5fc08fac..26665bd1 100644 --- a/test/VisuPrs/StreamLines/CMakeLists.txt +++ b/test/VisuPrs/StreamLines/CMakeLists.txt @@ -53,7 +53,7 @@ IF (PYTHON_EXECUTABLE) F9 ) SET(TIMEOUT 10000) - ADD_TEST(STREAMLINES_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) + ADD_TEST(STREAMLINES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) SET_TESTS_PROPERTIES(STREAMLINES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) ENDFOREACH( tfile ) ENDIF (PYTHON_EXECUTABLE) diff --git a/test/VisuPrs/Tables/CMakeLists.txt b/test/VisuPrs/Tables/CMakeLists.txt index 49cf1eb4..7d6b9419 100644 --- a/test/VisuPrs/Tables/CMakeLists.txt +++ b/test/VisuPrs/Tables/CMakeLists.txt @@ -23,7 +23,7 @@ IF (PYTHON_EXECUTABLE) A2 ) SET(TIMEOUT 10000) - ADD_TEST(TABLES_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) + ADD_TEST(TABLES_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) SET_TESTS_PROPERTIES(TABLES_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) ENDFOREACH( tfile ) ENDIF (PYTHON_EXECUTABLE) diff --git a/test/VisuPrs/Vectors/CMakeLists.txt b/test/VisuPrs/Vectors/CMakeLists.txt index 8c8e6d3f..48fc6ef1 100644 --- a/test/VisuPrs/Vectors/CMakeLists.txt +++ b/test/VisuPrs/Vectors/CMakeLists.txt @@ -54,7 +54,7 @@ IF (PYTHON_EXECUTABLE) F9 ) SET(TIMEOUT 10000) - ADD_TEST(VECTORS_${tfile} ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) + ADD_TEST(VECTORS_${tfile} ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/VisuPrs/Util/paravistesthelper.py ${TIMEOUT} ${CMAKE_CURRENT_SOURCE_DIR}/${tfile}.py ${PARAVIS_TEST_OUTPUT_DIR}) SET_TESTS_PROPERTIES(VECTORS_${tfile} PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED" TIMEOUT ${TIMEOUT}) ENDFOREACH( tfile ) ENDIF (PYTHON_EXECUTABLE) -- 2.30.2