X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelAPI%2FCMakeLists.txt;h=fb4db8b550eb191cf4f1048d788f4bba1e1af3e9;hb=fe443ed42df3b33646e053bd8001fd2899624b37;hp=13e4ee12ee28db715e778ed6d4ba2b257e57d0ac;hpb=a6b5300a8b356e933d4778d93bb78f3cc9d7b9cb;p=modules%2Fshaper.git

diff --git a/src/ModelAPI/CMakeLists.txt b/src/ModelAPI/CMakeLists.txt
index 13e4ee12e..fb4db8b55 100644
--- a/src/ModelAPI/CMakeLists.txt
+++ b/src/ModelAPI/CMakeLists.txt
@@ -1,3 +1,5 @@
+## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 FIND_PACKAGE(SWIG REQUIRED)
 INCLUDE(${SWIG_USE_FILE})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
@@ -5,59 +7,95 @@ INCLUDE(UnitTest)
 
 SET(PROJECT_HEADERS
     ModelAPI.h
-    ModelAPI_Session.h
-    ModelAPI_Plugin.h
-    ModelAPI_Feature.h
-    ModelAPI_CompositeFeature.h
-    ModelAPI_Data.h
-    ModelAPI_Object.h
-    ModelAPI_Document.h
     ModelAPI_Attribute.h
-    ModelAPI_AttributeInteger.h
-    ModelAPI_AttributeDouble.h
+    ModelAPI_AttributeBoolean.h
+    ModelAPI_AttributeIntArray.h
     ModelAPI_AttributeDocRef.h
-    ModelAPI_AttributeReference.h
+    ModelAPI_AttributeDouble.h
+    ModelAPI_AttributeInteger.h
     ModelAPI_AttributeRefAttr.h
+    ModelAPI_AttributeReference.h
+    ModelAPI_AttributeRefAttrList.h
     ModelAPI_AttributeRefList.h
-    ModelAPI_AttributeBoolean.h
-    ModelAPI_AttributeString.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_Validator.h
+    ModelAPI_Expression.h
+    ModelAPI_Feature.h
     ModelAPI_FeatureValidator.h
+    ModelAPI_Object.h
+    ModelAPI_Plugin.h
     ModelAPI_Result.h
     ModelAPI_ResultBody.h
+    ModelAPI_ResultCompSolid.h
     ModelAPI_ResultConstruction.h
+    ModelAPI_ResultGroup.h
+    ModelAPI_ResultParameter.h
     ModelAPI_ResultPart.h
-    ModelAPI_ResultParameters.h
-    ModelAPI_ResultValidator.h
-    ModelAPI_AttributeValidator.h
+    ModelAPI_Session.h
     ModelAPI_Tools.h
-    ModelAPI_RefAttrValidator.h 
+    ModelAPI_Validator.h
+    ModelAPI_Entity.h
 )
 
 SET(PROJECT_SOURCES
+    ModelAPI_Attribute.cpp
+    ModelAPI_AttributeBoolean.cpp
+    ModelAPI_AttributeIntArray.cpp
+    ModelAPI_AttributeDocRef.cpp
+    ModelAPI_AttributeDouble.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_Tools.cpp
+    ModelAPI_AttributeValidator.cpp
 )
 
 SET(PROJECT_LIBRARIES
     Config
 )
-
+SET(CMAKE_SWIG_FLAGS -threads -Wall)
 ADD_DEFINITIONS(-DMODELAPI_EXPORTS)
+
 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
+INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/Config
+                    ${PROJECT_SOURCE_DIR}/src/Events
+                    ${PROJECT_SOURCE_DIR}/src/GeomAPI
+                    ${PROJECT_SOURCE_DIR}/src/GeomAlgoAPI
 )
 
-SET(CMAKE_SWIG_FLAGS "")
 
 SET_SOURCE_FILES_PROPERTIES(ModelAPI.i PROPERTIES CPLUSPLUS ON)
 # "-includeall" is not needed: it starts to follow the standard inludes (like "string") without success
@@ -71,7 +109,7 @@ SET(SWIG_SCRIPTS
 
 SET(SWIG_LINK_LIBRARIES
   ModelAPI
-  GeomAPI 
+  GeomAPI
   ${PYTHON_LIBRARIES}
 )
 
@@ -82,9 +120,11 @@ 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)
+               TestUndoRedo.py
+               TestDocument.py
+               Test1064.py)