Fix remarks related to the "0021709: [CEA 583] Toolbar preferences" issue.

[modules/paravis.git] / idl / wrap.cmake

diff --git a/idl/wrap.cmake b/idl/wrap.cmake
index 39b6b57804a47f528e00a2d4f5f6b62d70fae587..b442571a44f78f9f4a9a32a3d88e4f319c0dcc29 100755 (executable)
--- a/idl/wrap.cmake
+++ b/idl/wrap.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2010-2013  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,6 +17,8 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+LIST(GET PARAVIEW_INCLUDE_DIRS 0 PARAVIEW_INCLUDE_DIR0)
+
 ADD_CUSTOM_COMMAND(
  OUTPUT vtkWrapIDL.h
  COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/create_header.py ${CMAKE_BINARY_DIR}
@@ -25,8 +27,9 @@ ADD_CUSTOM_COMMAND(
 
 ADD_CUSTOM_COMMAND(
  OUTPUT hints
- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/create_hints.py ${PARAVIEW_LIBRARY_DIRS}
- DEPENDS ${PARAVIEW_LIBRARY_DIRS}/hints ${CMAKE_CURRENT_SOURCE_DIR}/hints_paravis
+ COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/create_hints.py ${PARAVIEW_LIBRARY_DIR0}
+# DEPENDS ${PARAVIEW_LIBRARY_DIR0}/hints ${CMAKE_CURRENT_SOURCE_DIR}/hints_paravis
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/hints ${CMAKE_CURRENT_SOURCE_DIR}/hints_paravis
 )
 
 SET(WRAP_IDL)
@@ -69,8 +72,8 @@ IF(EXISTS ${CMAKE_BINARY_DIR}/wrapfiles.txt)
   ENDIF(WINDOWS)
   ADD_CUSTOM_COMMAND(
    OUTPUT PARAVIS_Gen_${VAL}.idl
-   COMMAND ${vtkWrapIDL_EXEFILE} ${PARAVIEW_INCLUDE_DIRS}/${VAL}.h hints 0 PARAVIS_Gen_${VAL}.idl
-   DEPENDS vtkWrapIDL ${PARAVIEW_INCLUDE_DIRS}/${VAL}.h hints ${DEP}
+   COMMAND ${vtkWrapIDL_EXEFILE} -o PARAVIS_Gen_${VAL}.idl --hints hints ${PARAVIEW_INCLUDE_DIR0}/${VAL}.h
+   DEPENDS vtkWrapIDL ${PARAVIEW_INCLUDE_DIR0}/${VAL}.h hints ${DEP}
   )
 
  ENDFOREACH(STR ${WRAP_LIST_REG})