X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FCMakeLists.txt;h=181a51e75d304dfdb479911c878f851fa817af1e;hb=bdbfb368d71ed11cc0391354a7d86c880cd94949;hp=2ebf396eacf2fe36d2bd1ae1f6d688be1d01e6af;hpb=83c4f9d21db70830d40da2a6d7d7ff66a697edf8;p=modules%2Fshaper.git

diff --git a/src/Model/CMakeLists.txt b/src/Model/CMakeLists.txt
index 2ebf396ea..181a51e75 100644
--- a/src/Model/CMakeLists.txt
+++ b/src/Model/CMakeLists.txt
@@ -10,6 +10,7 @@ SET(PROJECT_HEADERS
     Model_Session.h
     Model_Data.h
     Model_AttributeDouble.h
+    Model_AttributeDoubleArray.h
     Model_AttributeDocRef.h
     Model_AttributeReference.h
     Model_AttributeRefAttr.h
@@ -18,9 +19,11 @@ SET(PROJECT_HEADERS
     Model_AttributeBoolean.h
     Model_AttributeIntArray.h
     Model_AttributeString.h
+    Model_AttributeStringArray.h
     Model_AttributeInteger.h
     Model_AttributeSelection.h
     Model_AttributeSelectionList.h
+    Model_AttributeTables.h
     Model_BodyBuilder.h
     Model_Events.h
     Model_Expression.h
@@ -30,6 +33,7 @@ SET(PROJECT_HEADERS
     Model_ResultCompSolid.h
     Model_ResultConstruction.h
     Model_ResultPart.h
+    Model_ResultField.h
     Model_ResultGroup.h
     Model_ResultParameter.h
     Model_FeatureValidator.h
@@ -44,6 +48,7 @@ SET(PROJECT_SOURCES
     Model_Session.cpp
     Model_Data.cpp
     Model_AttributeDouble.cpp
+    Model_AttributeDoubleArray.cpp
     Model_AttributeDocRef.cpp
     Model_AttributeReference.cpp
     Model_AttributeRefAttr.cpp
@@ -52,9 +57,11 @@ SET(PROJECT_SOURCES
     Model_AttributeBoolean.cpp
     Model_AttributeIntArray.cpp
     Model_AttributeString.cpp
+    Model_AttributeStringArray.cpp
     Model_AttributeInteger.cpp
     Model_AttributeSelection.cpp
     Model_AttributeSelectionList.cpp
+    Model_AttributeTables.cpp
     Model_BodyBuilder.cpp
     Model_Events.cpp
     Model_Expression.cpp
@@ -64,6 +71,7 @@ SET(PROJECT_SOURCES
     Model_ResultCompSolid.cpp
     Model_ResultConstruction.cpp
     Model_ResultPart.cpp
+    Model_ResultField.cpp
     Model_ResultGroup.cpp
     Model_ResultParameter.cpp
     Model_FeatureValidator.cpp
@@ -72,9 +80,9 @@ SET(PROJECT_SOURCES
 )
 
 SET(PROJECT_LIBRARIES
-    ModelAPI 
-    Events 
-    Config 
+    ModelAPI
+    Events
+    Config
     GeomData
     GeomAPI
     GeomAlgoAPI
@@ -83,14 +91,7 @@ SET(PROJECT_LIBRARIES
     ${CAS_SHAPE}
     ${CAS_TKBO}
 )
-
-
-
-ADD_DEFINITIONS(-DMODEL_EXPORTS ${CAS_DEFINITIONS})
-ADD_LIBRARY(Model SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
-TARGET_LINK_LIBRARIES(Model ${PROJECT_LIBRARIES})
-
-INCLUDE_DIRECTORIES(
+SET(PROJECT_INCLUDES
   ../ModelAPI
   ../Events
   ../Config
@@ -101,4 +102,15 @@ INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
 )
 
-INSTALL(TARGETS Model DESTINATION bin)
+
+IF(TKTInspector)
+    ADD_DEFINITIONS(-DTINSPECTOR)
+ENDIF()
+
+ADD_DEFINITIONS(-DMODEL_EXPORTS ${CAS_DEFINITIONS})
+ADD_LIBRARY(Model SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
+TARGET_LINK_LIBRARIES(Model ${PROJECT_LIBRARIES})
+
+INCLUDE_DIRECTORIES(${PROJECT_INCLUDES})
+
+INSTALL(TARGETS Model DESTINATION ${SHAPER_INSTALL_BIN})