X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FCMakeLists.txt;h=8b7f5bf3a2b175499a593575702fe39b918b8c4e;hb=176403004ff97696f3c0b5f8bdf48692177fb34a;hp=ef4c82c12077d0ba4b2d4067fcf226634c746b2b;hpb=baa32827d0f7eac19aca82eb41d2aa708b358181;p=modules%2Fshaper.git

diff --git a/src/Model/CMakeLists.txt b/src/Model/CMakeLists.txt
index ef4c82c12..8b7f5bf3a 100644
--- a/src/Model/CMakeLists.txt
+++ b/src/Model/CMakeLists.txt
@@ -6,59 +6,77 @@ SET(PROJECT_HEADERS
     Model.h
     Model_Application.h
     Model_Document.h
+    Model_Objects.h
     Model_Session.h
     Model_Data.h
     Model_AttributeDouble.h
+    Model_AttributeDoubleArray.h
     Model_AttributeDocRef.h
     Model_AttributeReference.h
     Model_AttributeRefAttr.h
     Model_AttributeRefList.h
+    Model_AttributeRefAttrList.h
     Model_AttributeBoolean.h
     Model_AttributeIntArray.h
     Model_AttributeString.h
     Model_AttributeInteger.h
     Model_AttributeSelection.h
     Model_AttributeSelectionList.h
+    Model_BodyBuilder.h
     Model_Events.h
+    Model_Expression.h
     Model_Update.h
     Model_Validator.h
     Model_ResultBody.h
+    Model_ResultCompSolid.h
     Model_ResultConstruction.h
     Model_ResultPart.h
     Model_ResultGroup.h
+    Model_ResultParameter.h
     Model_FeatureValidator.h
+    Model_AttributeValidator.h
+    Model_SelectionNaming.h
 )
 
 SET(PROJECT_SOURCES
     Model_Application.cpp
     Model_Document.cpp
+    Model_Objects.cpp
     Model_Session.cpp
     Model_Data.cpp
     Model_AttributeDouble.cpp
+    Model_AttributeDoubleArray.cpp
     Model_AttributeDocRef.cpp
     Model_AttributeReference.cpp
     Model_AttributeRefAttr.cpp
     Model_AttributeRefList.cpp
+    Model_AttributeRefAttrList.cpp
     Model_AttributeBoolean.cpp
     Model_AttributeIntArray.cpp
     Model_AttributeString.cpp
     Model_AttributeInteger.cpp
     Model_AttributeSelection.cpp
     Model_AttributeSelectionList.cpp
+    Model_BodyBuilder.cpp
     Model_Events.cpp
+    Model_Expression.cpp
     Model_Update.cpp
     Model_Validator.cpp
     Model_ResultBody.cpp
+    Model_ResultCompSolid.cpp
     Model_ResultConstruction.cpp
     Model_ResultPart.cpp
     Model_ResultGroup.cpp
+    Model_ResultParameter.cpp
     Model_FeatureValidator.cpp
+    Model_AttributeValidator.cpp
+    Model_SelectionNaming.cpp
 )
 
 SET(PROJECT_LIBRARIES
-    ModelAPI 
-    Events 
-    Config 
+    ModelAPI
+    Events
+    Config
     GeomData
     GeomAPI
     GeomAlgoAPI
@@ -67,14 +85,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
@@ -85,4 +96,18 @@ INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
 )
 
-INSTALL(TARGETS Model DESTINATION bin)
+
+IF(EXISTS ${OCAFBROWSER_ROOT_DIR})
+    SET(PROJECT_LIBRARIES ${PROJECT_LIBRARIES} ${DFBrowserAPI})
+    SET(PROJECT_INCLUDES ${PROJECT_INCLUDES} ${OCAFBROWSER_INCLUDE_DIR})
+
+    ADD_DEFINITIONS(-DOCAFBROWSER)
+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})