From: vtn <vtn@opencascade.com>
Date: Fri, 1 Mar 2013 20:07:15 +0000 (+0000)
Subject: Porting to Paraview 3.98.1
X-Git-Tag: V7_1_0b1~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3f23a812717d2921af760b690dd6144eeb0667e2;p=modules%2Fparavis.git

Porting to Paraview 3.98.1
---

diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt
index 51d1ea24..f79543bf 100644
--- a/idl/CMakeLists.txt
+++ b/idl/CMakeLists.txt
@@ -121,7 +121,7 @@ FOREACH(input ${BASEIDL_FILES} ${WRAP_IDL})
   ENDIF(${BASE_INDEX} EQUAL -1)
   ADD_CUSTOM_COMMAND(
     OUTPUT ${outputs}
-    COMMAND ${OMNIIDL_EXECUTABLE} -bcxx ${IDLCXXFLAGS} -I${CMAKE_CURRENT_SOURCE_DIR} -I${KERNEL_ROOT_DIR}/idl/salome ${OMNIORB_IDLCXXFLAGS} ${input}
+    COMMAND ${OMNIORB_IDL_PYTHON} -bcxx ${IDLCXXFLAGS} -I${CMAKE_CURRENT_SOURCE_DIR} -I${KERNEL_ROOT_DIR}/idl/salome ${OMNIORB_IDLCXXFLAGS} ${input}
     MAIN_DEPENDENCY ${input}
     )
   INSTALL(FILES ${input} DESTINATION idl/salome)
@@ -131,7 +131,7 @@ FOREACH(input ${BASEIDL_FILES} ${WRAP_IDL})
   INSTALL(CODE "SET(IDL_FILE ${input})")
   INSTALL(CODE "SET(DIR lib/python${PYTHON_VERSION}/site-packages/salome)")
   INSTALL(CODE "SET(CMAKE_CURRENT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})")
-  INSTALL(CODE "SET(OMNIORB_IDL_COMPILER ${OMNIORB_IDL_COMPILER})")
+  INSTALL(CODE "SET(OMNIORB_IDL_PYTHON ${OMNIORB_IDL_PYTHON})")
   INSTALL(CODE "SET(IDLPYFLAGS -bpythonIDL -p${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_CURRENT_SOURCE_DIR} -I${KERNEL_ROOT_DIR}/idl/salome)")
   INSTALL(SCRIPT ${KERNEL_ROOT_DIR}/salome_adm/cmake_files/deprecated/install_python_from_idl.cmake)