From 2b47cad251f092bca44591981c60d7fe41203a41 Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 20 Aug 2013 10:02:41 +0000 Subject: [PATCH] CMake build procedure improvements: - CORBA staff --- idl/CMakeLists.txt | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt index 7d2a1ccee..38bd0204e 100755 --- a/idl/CMakeLists.txt +++ b/idl/CMakeLists.txt @@ -22,26 +22,20 @@ INCLUDE(UseOmniORB) # Provided by KERNEL INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} - ${CMAKE_CURRENT_BINARY_DIR} ) SET(SalomeIDLGUI_IDLSOURCES SalomeApp_Engine.idl ) -SET(IDL_INCLUDE_DIRS +SET(_idl_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${KERNEL_ROOT_DIR}/idl/salome ) -SET(TYPE SHARED) -IF(WINDOWS) - SET(TYPE STATIC) -ENDIF(WINDOWS) - -ADD_DEFINITIONS(${OMNIORB_DEFINITIONS}) +SET(_idl_link_flags + ${KERNEL_SalomeIDLKernel} +) -OMNIORB_ADD_MODULE(SalomeIDLGUI "${SalomeIDLGUI_IDLSOURCES}" "${IDL_INCLUDE_DIRS}" ${TYPE}) -TARGET_LINK_LIBRARIES(SalomeIDLGUI ${CORBA_LIBS}) - +OMNIORB_ADD_MODULE(SalomeIDLGUI "${SalomeIDLGUI_IDLSOURCES}" "${_idl_include_dirs}" "${_idl_link_flags}") INSTALL(TARGETS SalomeIDLGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) -- 2.39.2