-# Copyright (C) 2010-2014 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
${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")
-
- SET(SalomeIDLPARAVIS_IDLSOURCES
- PARAVIS_Gen.idl
- PARAVIS_Gen_Types.idl
- ${WRAP_IDL}
+SET(SalomeIDLPARAVIS_IDLSOURCES
+ ${CMAKE_CURRENT_SOURCE_DIR}/PVSERVER_Gen.idl
)
- SET(_idl_include_dirs
+SET(_idl_include_dirs
${CMAKE_CURRENT_SOURCE_DIR}
${KERNEL_ROOT_DIR}/idl/salome
- )
-ELSE()
- SET(SalomeIDLPARAVIS_IDLSOURCES
- ${CMAKE_CURRENT_SOURCE_DIR}/no_wrap/PARAVIS_Gen.idl
- )
- SET(_idl_include_dirs
- ${CMAKE_CURRENT_SOURCE_DIR}/no_wrap
- ${KERNEL_ROOT_DIR}/idl/salome
)
-ENDIF()
-
-ADD_DEFINITIONS(${OMNIORB_DEFINITIONS})
-
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})