CMake: add option SALOME_PARAVIS_ALL_TEST which lets to select - run all SALOME PARAV...

[modules/paravis.git] / src / VTKWrapping / wrap.cmake

diff --git a/src/VTKWrapping/wrap.cmake b/src/VTKWrapping/wrap.cmake
index daf5d126ae011833d48b87e295b8851d9d802b5c..4f0a7b0cf030cc624cc7168edb8826fe1f644d1a 100755 (executable)
--- a/src/VTKWrapping/wrap.cmake
+++ b/src/VTKWrapping/wrap.cmake
@@ -52,14 +52,14 @@ IF(EXISTS ${CMAKE_BINARY_DIR}/wrapfiles.txt)
   LIST(APPEND WRAP_IDL_I_HH PARAVIS_Gen_${VAL}_i.hh)
   LIST(APPEND WRAP_IDL_I_CC PARAVIS_Gen_${VAL}_i.cc)
 
-  SET(vtkWrapIDL_HH_EXEFILE ${CMAKE_CURRENT_BINARY_DIR}/vtkWrapIDL_HH)
-  IF(WINDOWS)
+  SET(vtkWrapIDL_HH_EXEFILE ${CMAKE_BINARY_DIR}/src/VTKWrapping/vtkWrapIDL_HH)
+  IF(WIN32)
     IF(CMAKE_BUILD_TOOL STREQUAL nmake)
-      SET(vtkWrapIDL_HH_EXEFILE ${CMAKE_CURRENT_BINARY_DIR}/vtkWrapIDL_HH.exe)
+      SET(vtkWrapIDL_HH_EXEFILE ${CMAKE_BINARY_DIR}/src/VTKWrapping/vtkWrapIDL_HH.exe)
     ELSE(CMAKE_BUILD_TOOL STREQUAL nmake)
-      SET(vtkWrapIDL_HH_EXEFILE ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/vtkWrapIDL_HH.exe)
+      SET(vtkWrapIDL_HH_EXEFILE ${CMAKE_BINARY_DIR}/src/VTKWrapping/${CMAKE_BUILD_TYPE}/vtkWrapIDL_HH.exe)
     ENDIF(CMAKE_BUILD_TOOL STREQUAL nmake)
-  ENDIF(WINDOWS)
+  ENDIF(WIN32)
 
   ADD_CUSTOM_COMMAND(
    OUTPUT PARAVIS_Gen_${VAL}_i.hh
@@ -67,14 +67,14 @@ IF(EXISTS ${CMAKE_BINARY_DIR}/wrapfiles.txt)
    DEPENDS vtkWrapIDL_HH ${PARAVIEW_INCLUDE_DIR0}/${VAL}.h ${CMAKE_BINARY_DIR}/idl/hints ${DEP_HH}
   ) 
 
-  SET(vtkWrapIDL_CC_EXEFILE ${CMAKE_CURRENT_BINARY_DIR}/vtkWrapIDL_CC)
-  IF(WINDOWS)
+  SET(vtkWrapIDL_CC_EXEFILE ${CMAKE_BINARY_DIR}/src/VTKWrapping/vtkWrapIDL_CC)
+  IF(WIN32)
     IF(CMAKE_BUILD_TOOL STREQUAL nmake)
-      SET(vtkWrapIDL_CC_EXEFILE ${CMAKE_CURRENT_BINARY_DIR}/vtkWrapIDL_CC.exe)
+      SET(vtkWrapIDL_CC_EXEFILE ${CMAKE_BINARY_DIR}/src/VTKWrapping/vtkWrapIDL_CC.exe)
     ELSE(CMAKE_BUILD_TOOL STREQUAL nmake)
-      SET(vtkWrapIDL_CC_EXEFILE ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/vtkWrapIDL_CC.exe)
+      SET(vtkWrapIDL_CC_EXEFILE ${CMAKE_BINARY_DIR}/src/VTKWrapping/${CMAKE_BUILD_TYPE}/vtkWrapIDL_CC.exe)
     ENDIF(CMAKE_BUILD_TOOL STREQUAL nmake)
-  ENDIF(WINDOWS)
+  ENDIF(WIN32)
 
   ADD_CUSTOM_COMMAND(
    OUTPUT PARAVIS_Gen_${VAL}_i.cc