getHeapMemorySize rearch

[tools/medcoupling.git] / idl / CMakeLists.txt

diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt
index 3e328f4f1c045c092f9afdfea188a478d0b06c59..8d3abc7cca82e712aad252dc8386f6c7040beb61 100644 (file)
--- a/idl/CMakeLists.txt
+++ b/idl/CMakeLists.txt
@@ -22,12 +22,11 @@ INCLUDE(UseOmniORB)
 
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
-  ${KERNEL_ROOT_DIR}/include/salome
+  ${KERNEL_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
 )
 
 SET(SalomeIDLMED_IDLSOURCES
-  #MED.idl
   MEDCouplingCorbaServant.idl
   ParaMEDCouplingCorbaServant.idl
   MEDDataManager.idl
@@ -36,32 +35,25 @@ SET(SalomeIDLMED_IDLSOURCES
   MEDOPFactory.idl
 )
 
-IF(MPI_IS_OK)
+IF(SALOME_USE_MPI)
   SET(SalomeIDLMED_IDLSOURCES ${SalomeIDLMED_IDLSOURCES} ParaMEDMEMComponent.idl)
-ENDIF(MPI_IS_OK)
+ENDIF(SALOME_USE_MPI)
 
 SET(SalomeIDLMEDTests_IDLSOURCES
   MEDCouplingCorbaServantTest.idl
 )
 
-SET(IDL_INCLUDE_DIRS
+SET(_idl_include_dirs
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${KERNEL_ROOT_DIR}/idl/salome
 )
 
-SET(TYPE)
-IF(WINDOWS)
-  SET(TYPE STATIC)
-ELSE(WINDOWS)
-  SET(TYPE SHARED)
-ENDIF(WINDOWS
+SET(_idl_link_flags
+  ${KERNEL_SalomeIDLKernel}
 )
-OMNIORB_ADD_MODULE(SalomeIDLMED "${SalomeIDLMED_IDLSOURCES}" "${IDL_INCLUDE_DIRS}" ${TYPE})
-TARGET_LINK_LIBRARIES(SalomeIDLMED ${CORBA_LIBS} ${KERNEL_LDFLAGS} ${KERNEL_SalomeIDLKernel})
-SET_TARGET_PROPERTIES(SalomeIDLMED PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS} ${PLATFORM_DEFINITIONS}")
 
-OMNIORB_ADD_MODULE(SalomeIDLMEDTests "${SalomeIDLMEDTests_IDLSOURCES}" "${IDL_INCLUDE_DIRS}" ${TYPE})
-TARGET_LINK_LIBRARIES(SalomeIDLMEDTests SalomeIDLMED)
-SET_TARGET_PROPERTIES(SalomeIDLMEDTests PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS} ${PLATFORM_DEFINITIONS}")
+OMNIORB_ADD_MODULE(SalomeIDLMED      "${SalomeIDLMED_IDLSOURCES}"      "${_idl_include_dirs}" "${_idl_link_flags}")
+OMNIORB_ADD_MODULE(SalomeIDLMEDTests "${SalomeIDLMEDTests_IDLSOURCES}" "${_idl_include_dirs}" "SalomeIDLMED")
 
-INSTALL(TARGETS SalomeIDLMED SalomeIDLMEDTests DESTINATION ${MED_salomelib_LIBS})
+INSTALL(TARGETS SalomeIDLMED EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
+INSTALL(TARGETS SalomeIDLMEDTests                              DESTINATION ${SALOME_INSTALL_LIBS})