Porting to Paraview 3.98.1

[modules/paravis.git] / idl / CMakeLists.txt

diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt
index 1c116faefcc49354573f794eead35c617e6e475e..f79543bfe9c270efb8987ae9715fda9e24e51a76 100644 (file)
--- a/idl/CMakeLists.txt
+++ b/idl/CMakeLists.txt
@@ -21,10 +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(${KERNEL_ROOT_DIR}/include/salome ${CMAKE_BINARY_DIR}/idl)
-
-#INCLUDE(vtkWrapHierarchy.cmake)
-#SET(VTK_WRAP_HIERARCHY_EXE vtkWrapHierarchy)
+INCLUDE_DIRECTORIES(${OMNIORB_INCLUDE_DIRS} ${KERNEL_ROOT_DIR}/include/salome ${CMAKE_BINARY_DIR}/idl)
 
 INCLUDE(wrap.cmake)
 
@@ -58,14 +55,14 @@ ADD_LIBRARY(SalomeIDLPARAVIS SHARED ${srcs})
 ENDIF(WINDOWS)
 
 SET(flags)
-FOREACH(f ${PLATFORM_CPPFLAGS} ${PTHREAD_CFLAGS} ${CORBA_INCLUDES} ${CORBA_CXXFLAGS} ${KERNEL_CXXFLAGS})
+FOREACH(f ${PLATFORM_CPPFLAGS} ${PTHREAD_CFLAGS} ${OMNIORB_DEFINITIONS} ${KERNEL_CXXFLAGS})
   SET(flags "${flags} ${f}")
-ENDFOREACH(f ${PLATFORM_CPPFLAGS} ${PTHREAD_CFLAGS} ${CORBA_INCLUDES} ${CORBA_CXXFLAGS} ${KERNEL_CXXFLAGS})
+ENDFOREACH(f ${PLATFORM_CPPFLAGS} ${PTHREAD_CFLAGS} ${OMNIORB_DEFINITIONS} ${KERNEL_CXXFLAGS})
 
 SET_TARGET_PROPERTIES(SalomeIDLPARAVIS PROPERTIES COMPILE_FLAGS "${flags}")
 SET_TARGET_PROPERTIES(SalomeIDLPARAVIS PROPERTIES VERSION ${VERSION_INFO} SOVERSION ${SOVERSION_INFO})
 
-TARGET_LINK_LIBRARIES(SalomeIDLPARAVIS ${PLATFORM_LIBADD} ${PLATFORM_LDFLAGS} ${CORBA_LIBS})
+TARGET_LINK_LIBRARIES(SalomeIDLPARAVIS ${PLATFORM_LIBADD} ${PLATFORM_LDFLAGS} ${OMNIORB_LIBRARIES})
 INSTALL(TARGETS SalomeIDLPARAVIS DESTINATION lib/salome)
   
 ADD_EXECUTABLE(vtkWrapIDL 
@@ -74,10 +71,15 @@ ADD_EXECUTABLE(vtkWrapIDL
   ${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}/src/ParaView/vtkWrapText.c
   ${CMAKE_CURRENT_SOURCE_DIR}/vtkWrapIDL.c)
 
+set_property(SOURCE ${CMAKE_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)
@@ -86,6 +88,10 @@ FOREACH(f ${PLATFORM_CPPFLAGS} ${PTHREAD_CFLAGS} ${PARAVIEW_INCLUDES} ${VTK_INCL
   SET(flags "${flags} ${f}")
 ENDFOREACH(f ${PLATFORM_CPPFLAGS} ${PTHREAD_CFLAGS} ${PARAVIEW_INCLUDES} ${VTK_INCLUDES})
 
+#VTN TODO:
+#IF(VTK_LEGACY_REMOVE)
+#  ADD_DEFINITIONS(-DVTK_PARSE_LEGACY_REMOVE)
+#ENDIF()
 SET_TARGET_PROPERTIES(vtkWrapIDL PROPERTIES COMPILE_FLAGS "${flags}")
 
 TARGET_LINK_LIBRARIES(vtkWrapIDL ${PLATFORM_LDFLAGS} ${PLATFORM_LIBADD})
@@ -115,7 +121,7 @@ FOREACH(input ${BASEIDL_FILES} ${WRAP_IDL})
   ENDIF(${BASE_INDEX} EQUAL -1)
   ADD_CUSTOM_COMMAND(
     OUTPUT ${outputs}
-    COMMAND ${OMNIORB_IDL} -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)
@@ -127,6 +133,6 @@ FOREACH(input ${BASEIDL_FILES} ${WRAP_IDL})
   INSTALL(CODE "SET(CMAKE_CURRENT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})")
   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/install_python_from_idl.cmake)
+  INSTALL(SCRIPT ${KERNEL_ROOT_DIR}/salome_adm/cmake_files/deprecated/install_python_from_idl.cmake)
 
 ENDFOREACH(input ${IDL_FILES})