Merge branch 'master' into V9_3_BR

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

diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt
index 7300916e28949086f815dc4bba8597672c258b22..db331ec468f76d95a8810e9d86c898aaeb4b2c7a 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) 2016-2019  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
@@ -17,47 +17,34 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(UseOmniORB)  # Provided by KERNEL
+IF(SALOME_PARAVIS_BUILD_INSITU)
+  INCLUDE(UseOmniORB)  # Provided by KERNEL
 
-INCLUDE_DIRECTORIES(
-  ${OMNIORB_INCLUDE_DIR}
-  ${PROJECT_BINARY_DIR}/idl
-)
-
-# we use PARAVIS specific back-end
-SET(OMNIORB_IDLPYFLAGS -bpythonIDL -p${CMAKE_CURRENT_SOURCE_DIR})
+  INCLUDE_DIRECTORIES(
+    ${OMNIORB_INCLUDE_DIR}
+    ${KERNEL_INCLUDE_DIRS}
+    ${PROJECT_BINARY_DIR}/idl
+    ${FIELDS_INCLUDE_DIRS}
+    ${MEDCOUPLING_INCLUDE_DIRS}
+  )
 
-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}
+    PARAVIS.idl
+    
   )
+
   SET(_idl_include_dirs
-    ${CMAKE_CURRENT_SOURCE_DIR}
     ${KERNEL_ROOT_DIR}/idl/salome
+    ${FIELDS_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}
-)
+  SET(_idl_link_flags
+    ${KERNEL_SalomeIDLKernel}
+    ${FIELDS_SalomeIDLMED}
+    
+  )
 
-OMNIORB_ADD_MODULE(SalomeIDLPARAVIS "${SalomeIDLPARAVIS_IDLSOURCES}" "${_idl_include_dirs}" "${_idl_link_flags}")
-INSTALL(TARGETS SalomeIDLPARAVIS EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
+  OMNIORB_ADD_MODULE(SalomeIDLPARAVIS "${SalomeIDLPARAVIS_IDLSOURCES}" "${_idl_include_dirs}" "${_idl_link_flags}")
+  INSTALL(TARGETS SalomeIDLPARAVIS EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
+ENDIF(SALOME_PARAVIS_BUILD_INSITU)