BoxFeature is rewritten + small corrections in APIs

[modules/shaper.git] / src / ModelAPI / CMakeLists.txt

diff --git a/src/ModelAPI/CMakeLists.txt b/src/ModelAPI/CMakeLists.txt
index 78d9901e685a9be732fa4c6cc6fafcb288a00361..87a43a2b7dabb8855acc59c42685b38ea9473c1f 100644 (file)
--- a/src/ModelAPI/CMakeLists.txt
+++ b/src/ModelAPI/CMakeLists.txt
@@ -1,22 +1,28 @@
 FIND_PACKAGE(SWIG REQUIRED)
 INCLUDE(${SWIG_USE_FILE})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+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
@@ -24,27 +30,37 @@ SET(PROJECT_HEADERS
     ModelAPI_ResultBody.h
     ModelAPI_ResultConstruction.h
     ModelAPI_ResultPart.h
-       ModelAPI_ResultParameters.h
+    ModelAPI_ResultParameters.h
+    ModelAPI_ResultGroup.h
+    ModelAPI_ResultValidator.h
+    ModelAPI_AttributeValidator.h
+    ModelAPI_Tools.h
+    ModelAPI_RefAttrValidator.h 
 )
 
 SET(PROJECT_SOURCES
-    ModelAPI_PluginManager.cpp
+    ModelAPI_Feature.cpp
+    ModelAPI_Session.cpp
+    ModelAPI_Tools.cpp
 )
 
 SET(PROJECT_LIBRARIES
     Config
 )
+SET(CMAKE_SWIG_FLAGS -threads -Wall)
+ADD_DEFINITIONS(-DMODELAPI_EXPORT)
 
-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
+  ../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
@@ -57,7 +73,8 @@ SET(SWIG_SCRIPTS
 )
 
 SET(SWIG_LINK_LIBRARIES
-  ModelAPI 
+  ModelAPI
+  GeomAPI 
   ${PYTHON_LIBRARIES}
 )
 
@@ -71,3 +88,6 @@ ENDIF(WIN32)
 INSTALL(TARGETS _ModelAPI DESTINATION swig)
 INSTALL(TARGETS ModelAPI DESTINATION bin)
 INSTALL(FILES ${SWIG_SCRIPTS} DESTINATION swig)
+
+ADD_UNIT_TESTS(TestConstants.py
+               TestUndoRedo.py)