X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=idl%2FCMakeLists.txt;h=063c2d1a4bd219c29650e9ffbe8d4a290fbf0397;hb=dc440ee6296657e05317713c6f7a920ecaef442b;hp=3cb948304f9fea370fc05906beb6735caf525412;hpb=4ca2ffe46b6653829ee8fcb97bcef039588c7e09;p=modules%2Fkernel.git

diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt
index 3cb948304..063c2d1a4 100755
--- a/idl/CMakeLists.txt
+++ b/idl/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2016  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
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,14 +17,14 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(${PROJECT_SOURCE_DIR}/salome_adm/cmake_files/UseOmniORB.cmake)
+INCLUDE(${CONFIGURATION_ROOT_DIR}/cmake/UseOmniORB.cmake)
 
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-CONFIGURE_FILE(Calcium_Ports.idl.in Calcium_Ports.idl @ONLY)
+SALOME_CONFIGURE_FILE(Calcium_Ports.idl.in Calcium_Ports.idl)
 
 SET(SalomeIDLKernel_IDLSOURCES
   SALOME_Exception.idl
@@ -36,6 +36,7 @@ SET(SalomeIDLKernel_IDLSOURCES
   SALOMEDS_Attributes.idl
   SALOME_Component.idl
   SALOME_ContainerManager.idl
+  SALOME_SDS.idl
   SALOME_Registry.idl
   Logger.idl
   SALOME_GenericObj.idl
@@ -66,12 +67,12 @@ SET(IDL_INCLUDE_DIRS
 
 SET(COMMON_FLAGS ${OMNIORB_DEFINITIONS})
 SET(TYPE)
-IF(WINDOWS)
+IF(WIN32)
   SET(COMMON_FLAGS "${COMMON_FLAGS} -DNOGDI")
   SET(TYPE STATIC)
-ELSE(WINDOWS)
+ELSE(WIN32)
   SET(TYPE SHARED)
-ENDIF(WINDOWS)
+ENDIF(WIN32)
 
 OMNIORB_ADD_MODULE(SalomeIDLKernel "${SalomeIDLKernel_IDLSOURCES}" "${IDL_INCLUDE_DIRS}")
 ADD_DEFINITIONS(${COMMON_FLAGS})
@@ -158,8 +159,8 @@ IF(SALOME_PACO_PARALLEL)
     ADD_CUSTOM_COMMAND(OUTPUT ${genidl} ${parsrc} ${parhdr} ${genpacosrc} ${genpacohdr}
       COMMAND ${OMNIORB_IDL_COMPILER} -p${PACO_ROOT_DIR}/lib/python -bpaco -Wb${input},${CMAKE_CURRENT_SOURCE_DIR}:${PACO_ROOT_DIR}/idl ${baseidl}
       DEPENDS ${input} ${baseidl})
-    INSTALL(FILES ${input} ${genidl} DESTINATION idl/salome)
-    INSTALL(FILES ${basehdr} ${parhdr} ${genpacohdr} DESTINATION include/salome)
+    INSTALL(FILES ${input} ${genidl} DESTINATION ${SALOME_INSTALL_IDLS})
+    INSTALL(FILES ${basehdr} ${parhdr} ${genpacohdr} DESTINATION ${SALOME_INSTALL_HEADERS})
     IF(OMNIORB_PYTHON_BACKEND)
       SET(IDLPYFLAGS "-bpython -p${OMNIORB_PYTHON_BACKEND} -I${CMAKE_CURRENT_SOURCE_DIR} -I${PACO_ROOT_DIR}/idl")
       INSTALL(CODE "OMNIORB_COMPILE_IDL_FORPYTHON_ON_INSTALL( \"${OMNIORB_IDL_COMPILER}\" \"${IDLPYFLAGS}\" \"${genidl}\" \"${CMAKE_INSTALL_PREFIX}/\${INSTALL_PYIDL_DIR}\" )")