X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelAPI%2FCMakeLists.txt;h=1127806c7f87aa6b3fd8c65d7dd8b8f4713bc0ae;hb=da6ada6975c41128a1890eade5127e700420390b;hp=44602ce1c17ab5e8dbff136c9bab23e62280acb5;hpb=baa32827d0f7eac19aca82eb41d2aa708b358181;p=modules%2Fshaper.git

diff --git a/src/ModelAPI/CMakeLists.txt b/src/ModelAPI/CMakeLists.txt
index 44602ce1c..1127806c7 100644
--- a/src/ModelAPI/CMakeLists.txt
+++ b/src/ModelAPI/CMakeLists.txt
@@ -12,34 +12,37 @@ SET(PROJECT_HEADERS
     ModelAPI_AttributeIntArray.h
     ModelAPI_AttributeDocRef.h
     ModelAPI_AttributeDouble.h
+    ModelAPI_AttributeDoubleArray.h
     ModelAPI_AttributeInteger.h
     ModelAPI_AttributeRefAttr.h
     ModelAPI_AttributeReference.h
+    ModelAPI_AttributeRefAttrList.h
     ModelAPI_AttributeRefList.h
     ModelAPI_AttributeSelection.h
     ModelAPI_AttributeSelectionList.h
     ModelAPI_AttributeString.h
     ModelAPI_AttributeValidator.h
+    ModelAPI_BodyBuilder.h
     ModelAPI_CompositeFeature.h
     ModelAPI_Data.h
     ModelAPI_Document.h
     ModelAPI_Events.h
+    ModelAPI_Expression.h
     ModelAPI_Feature.h
     ModelAPI_FeatureValidator.h
     ModelAPI_Object.h
     ModelAPI_Plugin.h
-    ModelAPI_RefAttrValidator.h 
     ModelAPI_Result.h
     ModelAPI_ResultBody.h
+    ModelAPI_ResultCompSolid.h
     ModelAPI_ResultConstruction.h
     ModelAPI_ResultGroup.h
-    ModelAPI_ResultParameters.h
+    ModelAPI_ResultParameter.h
     ModelAPI_ResultPart.h
-    ModelAPI_ResultValidator.h
     ModelAPI_Session.h
     ModelAPI_Tools.h
-    ModelAPI_ShapeValidator.h
     ModelAPI_Validator.h
+    ModelAPI_Entity.h
 )
 
 SET(PROJECT_SOURCES
@@ -48,28 +51,35 @@ SET(PROJECT_SOURCES
     ModelAPI_AttributeIntArray.cpp
     ModelAPI_AttributeDocRef.cpp
     ModelAPI_AttributeDouble.cpp
+    ModelAPI_AttributeDoubleArray.cpp
     ModelAPI_AttributeInteger.cpp
     ModelAPI_AttributeRefAttr.cpp
     ModelAPI_AttributeReference.cpp
+    ModelAPI_AttributeRefAttrList.cpp
     ModelAPI_AttributeRefList.cpp
     ModelAPI_AttributeSelection.cpp
     ModelAPI_AttributeSelectionList.cpp
     ModelAPI_AttributeString.cpp
+    ModelAPI_BodyBuilder.cpp
     ModelAPI_CompositeFeature.cpp
     ModelAPI_Data.cpp
     ModelAPI_Document.cpp
     ModelAPI_Events.cpp
+    ModelAPI_Expression.cpp
     ModelAPI_Feature.cpp
+    ModelAPI_FeatureValidator.cpp
     ModelAPI_Object.cpp
     ModelAPI_Plugin.cpp
     ModelAPI_Result.cpp
     ModelAPI_ResultBody.cpp
+    ModelAPI_ResultCompSolid.cpp
     ModelAPI_ResultConstruction.cpp
     ModelAPI_ResultGroup.cpp
     ModelAPI_ResultPart.cpp
+    ModelAPI_ResultParameter.cpp
     ModelAPI_Session.cpp
-    ModelAPI_ShapeValidator.cpp
     ModelAPI_Tools.cpp
+    ModelAPI_AttributeValidator.cpp
 )
 
 SET(PROJECT_LIBRARIES
@@ -82,11 +92,10 @@ ADD_LIBRARY(ModelAPI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
 SET_TARGET_PROPERTIES(ModelAPI PROPERTIES LINKER_LANGUAGE CXX)
 TARGET_LINK_LIBRARIES(ModelAPI ${PROJECT_LIBRARIES})
 
-INCLUDE_DIRECTORIES(
-  ../Config 
-  ../Events
-  ../GeomAPI
-  ../GeomAlgoAPI
+INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/Config
+                    ${PROJECT_SOURCE_DIR}/src/Events
+                    ${PROJECT_SOURCE_DIR}/src/GeomAPI
+                    ${PROJECT_SOURCE_DIR}/src/GeomAlgoAPI
 )
 
 
@@ -102,7 +111,7 @@ SET(SWIG_SCRIPTS
 
 SET(SWIG_LINK_LIBRARIES
   ModelAPI
-  GeomAPI 
+  GeomAPI
   ${PYTHON_LIBRARIES}
 )
 
@@ -113,10 +122,15 @@ IF(WIN32)
   SET_TARGET_PROPERTIES(_ModelAPI PROPERTIES DEBUG_OUTPUT_NAME _ModelAPI_d)
 ENDIF(WIN32)
 
-INSTALL(TARGETS _ModelAPI DESTINATION swig)
-INSTALL(TARGETS ModelAPI DESTINATION bin)
-INSTALL(FILES ${SWIG_SCRIPTS} DESTINATION swig)
+INSTALL(TARGETS _ModelAPI DESTINATION ${SHAPER_INSTALL_SWIG})
+INSTALL(TARGETS ModelAPI DESTINATION ${SHAPER_INSTALL_BIN})
+INSTALL(FILES ${SWIG_SCRIPTS} DESTINATION ${SHAPER_INSTALL_SWIG})
 
 ADD_UNIT_TESTS(TestConstants.py
                TestUndoRedo.py
-               TestDocument.py)
+               TestDocument.py
+               Test1064.py
+               TestResults.py
+               TestIntArray.py
+               Test1512.py
+               TestDoubleArray.py)