CMake improvement: usage of SALOME_GUI_MODE() macro

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

diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt
index 3b40cefbb9b971afdbc825a186221386ebff1314..4e31c6b0110bf99f570b948c5364d23616db231f 100644 (file)
--- a/idl/CMakeLists.txt
+++ b/idl/CMakeLists.txt
@@ -1,4 +1,4 @@
-# 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
@@ -24,40 +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")
-  
-  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/PVSERVER_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}
 )
 
+# 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})