Merge branch 'rbe/evol-job-newparams'

[modules/kernel.git] / src / SALOMEDS / CMakeLists.txt

diff --git a/src/SALOMEDS/CMakeLists.txt b/src/SALOMEDS/CMakeLists.txt
index 0fe8dec8d4d604ed04c1b92a06b86cb359fd3744..aef592069dca85f3705f2ab17da6230e02437171 100755 (executable)
--- a/src/SALOMEDS/CMakeLists.txt
+++ b/src/SALOMEDS/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2014  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
@@ -18,14 +18,16 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${PTHREAD_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${OMNIORB_INCLUDE_DIR}
   ${HDF5_INCLUDE_DIRS}
-  ${Boost_INCLUDE_DIRS}
-  ${CMAKE_BINARY_DIR}/salome_adm
+  ${Boost_INCLUDE_DIR}
+  ${SIMANIO_INCLUDE_DIRS}
+  ${PROJECT_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}/../HDFPersist
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
   ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace
+  ${CMAKE_CURRENT_SOURCE_DIR}/../KernelHelpers
   ${CMAKE_CURRENT_SOURCE_DIR}/../Utils
   ${CMAKE_CURRENT_SOURCE_DIR}/../DF
   ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMEDSImpl
@@ -33,13 +35,15 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}/../GenericObj
   ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMEDSClient
   ${CMAKE_CURRENT_SOURCE_DIR}/../LifeCycleCORBA
-  ${CMAKE_BINARY_DIR}/idl
+  ${CMAKE_CURRENT_SOURCE_DIR}/../TOOLSDS
+  ${CMAKE_CURRENT_SOURCE_DIR}/../Container
+  ${PROJECT_BINARY_DIR}/idl
 )
 
 ADD_DEFINITIONS(${OMNIORB_DEFINITIONS} ${HDF5_DEFINITIONS} ${BOOST_DEFINITIONS})
-IF(WINDOWS)
+IF(WIN32)
   ADD_DEFINITIONS(-DNOGDI)
-ENDIF(WINDOWS)
+ENDIF(WIN32)
 
 SET(COMMON_LIBS
   TOOLSDS
@@ -48,12 +52,14 @@ SET(COMMON_LIBS
   SALOMELocalTrace
   SALOMEBasics
   SalomeHDFPersist
+  SalomeKernelHelpers
   DF
   SalomeDSImpl
   SalomeGenericObj
   SalomeLifeCycleCORBA
   SalomeIDLKernel
   ${HDF5_C_LIBRARIES}
+  ${SIMANIO_LIBRARIES}
 )
 
 SET(SalomeDS_SOURCES
@@ -64,6 +70,8 @@ SET(SalomeDS_SOURCES
   SALOMEDS_UseCaseIterator_i.cxx
   SALOMEDS_ChildIterator_i.cxx
   SALOMEDS_SComponentIterator_i.cxx
+  SALOMEDS_SimanStudy_i.cxx
+  SALOMEDS_SimanStudy.cxx
   SALOMEDS_Study_i.cxx
   SALOMEDS_StudyBuilder_i.cxx
   SALOMEDS_SObject_i.cxx
@@ -177,5 +185,7 @@ SET(COMMON_HEADERS_HXX
   SALOMEDS_Defines.hxx
   SALOMEDS_wrap.hxx
   SALOMEDS_Attributes_wrap.hxx
+  SALOMEDS_SimanStudy.hxx
+  SALOMEDS_SimanStudy_i.hxx
 )
 INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS})