X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelAPI%2FCMakeLists.txt;h=e30ddf142f04d85ffa7d5271d29ac62228068689;hb=031fb5e7c551e695afa72a9de299f118a40d8d88;hp=cc1596c0fb89a4670c01bcbd69f917ccc0e45417;hpb=96ff1d1fb2acb842cee193f15492de81060a1d58;p=modules%2Fshaper.git

diff --git a/src/ModelAPI/CMakeLists.txt b/src/ModelAPI/CMakeLists.txt
index cc1596c0f..e30ddf142 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,19 +7,24 @@ INCLUDE(UnitTest)
 
 SET(PROJECT_HEADERS
     ModelAPI.h
-    ModelAPI_PluginManager.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_AttributeDocRef.h
     ModelAPI_AttributeReference.h
     ModelAPI_AttributeRefAttr.h
     ModelAPI_AttributeRefList.h
     ModelAPI_AttributeBoolean.h
+    ModelAPI_AttributeString.h
+    ModelAPI_AttributeSelection.h
+    ModelAPI_AttributeSelectionList.h
     ModelAPI_Events.h
     ModelAPI_Validator.h
     ModelAPI_FeatureValidator.h
@@ -26,22 +33,26 @@ SET(PROJECT_HEADERS
     ModelAPI_ResultConstruction.h
     ModelAPI_ResultPart.h
     ModelAPI_ResultParameters.h
-	ModelAPI_ResultValidator.h
-	ModelAPI_AttributeValidator.h
-	ModelAPI_Tools.h
+    ModelAPI_ResultGroup.h
+    ModelAPI_ResultValidator.h
+    ModelAPI_AttributeValidator.h
+    ModelAPI_Tools.h
+    ModelAPI_RefAttrValidator.h 
 )
 
 SET(PROJECT_SOURCES
+    ModelAPI_Events.cpp
     ModelAPI_Feature.cpp
-    ModelAPI_PluginManager.cpp
-	ModelAPI_Tools.cpp
+    ModelAPI_Session.cpp
+    ModelAPI_Tools.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})
@@ -50,9 +61,9 @@ INCLUDE_DIRECTORIES(
   ../Config 
   ../Events
   ../GeomAPI
+  ../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
@@ -82,4 +93,5 @@ INSTALL(TARGETS ModelAPI DESTINATION bin)
 INSTALL(FILES ${SWIG_SCRIPTS} DESTINATION swig)
 
 ADD_UNIT_TESTS(TestConstants.py
-               TestUndoRedo.py)
+               TestUndoRedo.py
+               TestDocument.py)