From f91a5473f7bc0ed47093dff9921771600a97d7ff Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 20 Aug 2013 10:03:45 +0000 Subject: [PATCH] CMake build procedure improvements: - CORBA staff --- idl/CMakeLists.txt | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt index 15dee2d78..8d3abc7cc 100644 --- a/idl/CMakeLists.txt +++ b/idl/CMakeLists.txt @@ -27,7 +27,6 @@ INCLUDE_DIRECTORIES( ) SET(SalomeIDLMED_IDLSOURCES - #MED.idl MEDCouplingCorbaServant.idl ParaMEDCouplingCorbaServant.idl MEDDataManager.idl @@ -44,25 +43,17 @@ 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 EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) -INSTALL(TARGETS SalomeIDLMEDTests DESTINATION ${SALOME_INSTALL_LIBS}) +INSTALL(TARGETS SalomeIDLMEDTests DESTINATION ${SALOME_INSTALL_LIBS}) -- 2.39.2