X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=idl%2FCMakeLists.txt;h=38bd0204e3986d9f942ec694b77dcb2ab6e04bdc;hb=2a3b43e23a2ec55537247f465a82dc98993f8206;hp=82e0c8fe9a1b204e55311ace27b7d01dd4df9eb5;hpb=8c5294030a4c11ca0a18be48fc0165466861adad;p=modules%2Fgui.git diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt index 82e0c8fe9..38bd0204e 100755 --- a/idl/CMakeLists.txt +++ b/idl/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -17,30 +17,25 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/UseOMNIORB.cmake) +INCLUDE(UseOmniORB) # Provided by KERNEL INCLUDE_DIRECTORIES( - ${OMNIORB_INCLUDE_DIRS} - ${KERNEL_ROOT_DIR}/include/salome - ${CMAKE_CURRENT_BINARY_DIR} + ${OMNIORB_INCLUDE_DIR} + ${KERNEL_INCLUDE_DIRS} ) 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) +SET(_idl_link_flags + ${KERNEL_SalomeIDLKernel} +) -OMNIORB_ADD_MODULE(SalomeIDLGUI "${SalomeIDLGUI_IDLSOURCES}" "${IDL_INCLUDE_DIRS}" ${TYPE}) -TARGET_LINK_LIBRARIES(SalomeIDLGUI ${CORBA_LIBS}) -SET_TARGET_PROPERTIES(SalomeIDLGUI PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS}") - -INSTALL(TARGETS SalomeIDLGUI DESTINATION ${GUI_salomelib_LIBS}) +OMNIORB_ADD_MODULE(SalomeIDLGUI "${SalomeIDLGUI_IDLSOURCES}" "${_idl_include_dirs}" "${_idl_link_flags}") +INSTALL(TARGETS SalomeIDLGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})