X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=idl%2FCMakeLists.txt;h=4e31c6b0110bf99f570b948c5364d23616db231f;hb=6d8bd41fbd1886c00525b5205b9fe5a5e49bda77;hp=22d2e6dac7dc2215ce1fc30f73e3ec85fa656298;hpb=8b3c863df49b1411b4db4be153611542d0235d13;p=modules%2Fparavis.git

diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt
index 22d2e6da..4e31c6b0 100644
--- a/idl/CMakeLists.txt
+++ b/idl/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2010-2013  CEA/DEN, EDF R&D
+# Copyright (C) 2010-2015  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
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -24,32 +24,20 @@ INCLUDE_DIRECTORIES(
   ${PROJECT_BINARY_DIR}/idl
 )
 
-# we use PARAVIS specific back-end
-SET(OMNIORB_IDLPYFLAGS -bpythonIDL -p${CMAKE_CURRENT_SOURCE_DIR})
+ADD_DEFINITIONS(${OMNIORB_DEFINITIONS})
 
-IF(NOT SALOME_PARAVIS_MINIMAL_CORBA)
-  INCLUDE(wrap.cmake) 
-  # Hack to have a -D on the omniidl command line:
-  # (again, this shouldn't last for long ...) 
-  SET(OMNIORB_IDLCXXFLAGS "${OMNIORB_IDLCXXFLAGS};-DPARAVIS_WITH_FULL_CORBA")
-  SET(OMNIORB_IDLPYFLAGS "${OMNIORB_IDLPYFLAGS};-DPARAVIS_WITH_FULL_CORBA")
-  ADD_DEFINITIONS(-DPARAVIS_WITH_FULL_CORBA)
-ENDIF()  
-  ADD_DEFINITIONS(${OMNIORB_DEFINITIONS})
 SET(SalomeIDLPARAVIS_IDLSOURCES
-  PARAVIS_Gen.idl
-  PARAVIS_Gen_Types.idl
-  ${WRAP_IDL}
+    ${CMAKE_CURRENT_SOURCE_DIR}/PVSERVER_Gen.idl
   )
-
 SET(_idl_include_dirs
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${KERNEL_ROOT_DIR}/idl/salome
-)
-
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${KERNEL_ROOT_DIR}/idl/salome
+  )  
 SET(_idl_link_flags
   ${KERNEL_SalomeIDLKernel}
 )
 
-OMNIORB_ADD_MODULE(SalomeIDLPARAVIS "${SalomeIDLPARAVIS_IDLSOURCES}" "${_idl_include_dirs}" "${_idl_link_flags}")
-INSTALL(TARGETS SalomeIDLPARAVIS EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
+# Demand Python generation:
+SET(OMNIORB_PYTHON_BACKEND 1)
+OMNIORB_ADD_MODULE(SalomeIDLPVServer "${SalomeIDLPARAVIS_IDLSOURCES}" "${_idl_include_dirs}" "${_idl_link_flags}")
+INSTALL(TARGETS SalomeIDLPVServer EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})