CMake: replacing CMAKE_* variables by PROJECT_* variabls

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6b0baf7a171dbd161685460227a9cf402cd663a..c1690f5c6e6b0d5aeacb913043c5b4cff143732c 100644 (file)
--- 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 ecf37a9937062abe530d518f29af86b29471e858..091c6a4a2e8a35fdab74fcd4be5ba6f8ef633399 100644 (file)
--- 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 6c46b5cc15ed0cfa2218146b86b514c870488fcd..7bb220cdee2d84457c0d800413fb7f0c1cad665c 100644 (file)
--- 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 7dd41f2ceedf72f34a57ab1fad6cd265980e4777..3562651f4da6c9afde1e67d4edf50fd86a11f248 100644 (file)
--- 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 9b314649bd631e6f78c5eea89d39177009a6c7fb..34881a102d5b9bd162249903671b008915a61042 100644 (file)
--- 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 58fd1949c1aeb1415a3819a737e397200034f817..75c315301c5d8502aa05b64a60ce0c97cafaa975 100644 (file)
--- 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 0c9b9d82f1be322eff478f519df10142bbf2085a..d5372e2ddc2afc4bedb69617c9e9c531b9314b15 100644 (file)
--- 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 532b99a85aca193a80651632082642c24d360151..973d356b39ff40b18d55a0156b81eaa5e032634e 100755 (executable)
--- 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 45d16321ffe804061eefc28302060b4c03295539..3a4e12ab0b2fe3cc6d9061a20885d953f57cf092 100755 (executable)
--- 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 180d91a2b30dc350beb7de9e997b6c2176ca8b7c..ad8dd3da5276f95effdc96b60cf4b7c747cd0421 100644 (file)
--- 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 008f04cd1ef56cfbe5eb19d72a622103287a960c..f48e2a8ad7f7025b634ce5bd2bc4b755c67d78fb 100644 (file)
--- 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 0a54ca34eb25a894910134eddd578ec53cac6962..cbff4753168e0bd39ed2debda38cbf52ab4d8d4d 100644 (file)
--- 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 e2a0317fd13e6aa2cdc5382dd45bdbbe4bb52228..19a1bf824cfe1ba1160ab910b8b19470e5938f29 100644 (file)
--- 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 d936dea572d2775904db5f55cb0a8bb787ba8230..6b891f0cb9b2c0a2e09ee35a012d73dd8a94192d 100755 (executable)
--- 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 623b9de781b21668627c0c0d44d28bfda5fec333..4add8454e1690d53930b2091bcc01dc2bbb1c532 100644 (file)
--- 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 b7373cd9f23378050f8dc0f4028d6f6bb11d0efa..eb53d51f7af7fb0a6e132cb874ca2d9c387b6f95 100755 (executable)
--- 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 1fb2b9af495c736dd3c7540cafe7aef4093d3533..67fef0b30e7d54b827bfda7e069ad732a7310751 100644 (file)
--- 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 f6d8942c9364d206129a2e67d159216e4479967a..7cdc4ba46966173b590512e56af65164baa22a1d 100644 (file)
--- 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 3706661f3ed6c876f665733363eef37805a3f2ca..40981a9af2f142375411d4de3762e09c57fab647 100644 (file)
--- 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 5fc08face2ff2ea9c572e9c2a5047153970afde9..26665bd16caf83ece879da2aa38c819a7b02e234 100644 (file)
--- 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 49cf1eb4dbabe8b3ab0175036f92f92a66255414..7d6b9419b98165474a8117d17c4bfa0173bc1d33 100644 (file)
--- 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 8c8e6d3fe0c13d9c73c51f60687ea0a8e01de1b9..48fc6ef13b8f382c857a290b6cb424e035aab076 100644 (file)
--- 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)