Salome HOME
Merge from V6_main 28/02/2013
[modules/kernel.git] / src / SALOMEDSImpl / CMakeLists.txt
index d3daf020ffc3768d1bf9e8f0047d0d3fba482f3b..09b8883708aa136f7edeb808874fb5d5d3387460 100755 (executable)
 #
 
 INCLUDE_DIRECTORIES(
-  ${OMNIORB_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIRS}
   ${HDF5_INCLUDE_DIRS}
-  ${BOOST_INCLUDE_DIRS}
+  ${Boost_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
   ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace
   ${CMAKE_CURRENT_SOURCE_DIR}/../HDFPersist
   ${CMAKE_CURRENT_SOURCE_DIR}/../DF
-  ${CMAKE_CURRENT_SOURCE_DIR}/../GenericObj
-  ${CMAKE_BINARY_DIR}/idl
   ${CMAKE_BINARY_DIR}
 )
 
 # This local variable defines the list of FLAGS common to all target in this package.
-SET(COMMON_FLAGS "${HDF5_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${BOOST_DEFINITIONS} ${PLATFORM_DEFINITIONS}")
+ADD_DEFINITIONS(${HDF5_DEFINITIONS} ${BOOST_DEFINITIONS})
 
 # This local variable defines the list of dependant libraries common to all target in this package.  
 SET(COMMON_LIBS
   SALOMEBasics
   SalomeHDFPersist
   DF
-  SalomeGenericObj
-  SalomeIDLKernel
-  ${HDF5_LIBS}
+  ${HDF5_C_LIBRARIES}
 )
 
 SET(SalomeDSImpl_SOURCES
@@ -95,67 +90,14 @@ SET(SalomeDSImpl_SOURCES
   SALOMEDSImpl_TMPFile.cxx
   SALOMEDSImpl_GenericVariable.cxx
   SALOMEDSImpl_ScalarVariable.cxx
-  SALOMEDSImpl_AttributeComment.hxx
-  SALOMEDSImpl_AttributeDrawable.hxx
-  SALOMEDSImpl_AttributeExpandable.hxx
-  SALOMEDSImpl_AttributeExternalFileDef.hxx
-  SALOMEDSImpl_AttributeFileType.hxx
-  SALOMEDSImpl_AttributeFlags.hxx
-  SALOMEDSImpl_AttributeGraphic.hxx
-  SALOMEDSImpl_AttributeInteger.hxx
-  SALOMEDSImpl_AttributeIOR.hxx
-  SALOMEDSImpl_AttributeLocalID.hxx
-  SALOMEDSImpl_AttributeName.hxx
-  SALOMEDSImpl_AttributeOpened.hxx
-  SALOMEDSImpl_AttributePersistentRef.hxx
-  SALOMEDSImpl_AttributePixMap.hxx
-  SALOMEDSImpl_AttributePythonObject.hxx
-  SALOMEDSImpl_AttributeReal.hxx
-  SALOMEDSImpl_AttributeReference.hxx
-  SALOMEDSImpl_AttributeSelectable.hxx
-  SALOMEDSImpl_AttributeSequenceOfInteger.hxx
-  SALOMEDSImpl_AttributeSequenceOfReal.hxx
-  SALOMEDSImpl_Attributes.hxx
-  SALOMEDSImpl_AttributeStudyProperties.hxx
-  SALOMEDSImpl_AttributeTable.hxx
-  SALOMEDSImpl_AttributeTableOfInteger.hxx
-  SALOMEDSImpl_AttributeTableOfReal.hxx
-  SALOMEDSImpl_AttributeTableOfString.hxx
-  SALOMEDSImpl_AttributeTarget.hxx
-  SALOMEDSImpl_AttributeTextColor.hxx
-  SALOMEDSImpl_AttributeTextHighlightColor.hxx
-  SALOMEDSImpl_AttributeTreeNode.hxx
-  SALOMEDSImpl_AttributeUserID.hxx
-  SALOMEDSImpl_AttributeParameter.hxx
-  SALOMEDSImpl_AttributeString.hxx
-  SALOMEDSImpl_Callback.hxx
-  SALOMEDSImpl_ChildIterator.hxx
-  SALOMEDSImpl_ChildNodeIterator.hxx
-  SALOMEDSImpl_Defines.hxx
-  SALOMEDSImpl_Driver.hxx
-  SALOMEDSImpl_GenericAttribute.hxx
-  SALOMEDSImpl_SComponent.hxx
-  SALOMEDSImpl_SComponentIterator.hxx
-  SALOMEDSImpl_SObject.hxx
-  SALOMEDSImpl_StudyBuilder.hxx
-  SALOMEDSImpl_StudyHandle.hxx
-  SALOMEDSImpl_Study.hxx
-  SALOMEDSImpl_StudyManager.hxx
-  SALOMEDSImpl_Tool.hxx
-  SALOMEDSImpl_UseCaseBuilder.hxx
-  SALOMEDSImpl_UseCaseIterator.hxx
-  SALOMEDSImpl_GenericVariable.hxx
-  SALOMEDSImpl_ScalarVariable.hxx
 ) 
 
-ADD_LIBRARY(SalomeDSImpl SHARED ${SalomeDSImpl_SOURCES})
-SET_TARGET_PROPERTIES(SalomeDSImpl PROPERTIES COMPILE_FLAGS "${COMMON_FLAGS}")
-TARGET_LINK_LIBRARIES(SalomeDSImpl SALOMELocalTrace ${COMMON_LIBS} ${OMNIORB_LIBS} ${PLATFORM_LIBS})
+ADD_LIBRARY(SalomeDSImpl ${SalomeDSImpl_SOURCES})
+TARGET_LINK_LIBRARIES(SalomeDSImpl SALOMELocalTrace ${COMMON_LIBS} ${PLATFORM_LIBS})
 INSTALL(TARGETS SalomeDSImpl DESTINATION ${KERNEL_salomelib_LIBS})
 
 ADD_EXECUTABLE(testDS testDS.cxx)
-SET_TARGET_PROPERTIES(testDS PROPERTIES COMPILE_FLAGS "${COMMON_FLAGS}")
-TARGET_LINK_LIBRARIES(testDS SalomeDSImpl ${COMMON_LIBS} ${OMNIORB_LIBS} ${PLATFORM_LIBS})
+TARGET_LINK_LIBRARIES(testDS SalomeDSImpl ${COMMON_LIBS} ${PLATFORM_LIBS})
 INSTALL(TARGETS testDS DESTINATION ${KERNEL_salomebin_BINS})
 
 FILE(GLOB COMMON_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")