X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelAPI%2FCMakeLists.txt;h=93b919ccc020ca02c070b47df70ea1f808cde8e5;hb=dc1f458b1518baeab0479275e47fd60d50bc18b7;hp=8e809227a85754099eae7ac88c56ee5220a2818d;hpb=3e67d539ff2a32111d8559201692fa04157fbc3b;p=modules%2Fshaper.git

diff --git a/src/ModelAPI/CMakeLists.txt b/src/ModelAPI/CMakeLists.txt
index 8e809227a..93b919ccc 100644
--- a/src/ModelAPI/CMakeLists.txt
+++ b/src/ModelAPI/CMakeLists.txt
@@ -51,12 +51,12 @@ SET(PROJECT_HEADERS
     ModelAPI_Expression.h
     ModelAPI_Feature.h
     ModelAPI_FeatureValidator.h
+    ModelAPI_Folder.h
     ModelAPI_IReentrant.h
     ModelAPI_Object.h
     ModelAPI_Plugin.h
     ModelAPI_Result.h
     ModelAPI_ResultBody.h
-    ModelAPI_ResultCompSolid.h
     ModelAPI_ResultConstruction.h
     ModelAPI_ResultField.h
     ModelAPI_ResultGroup.h
@@ -94,12 +94,12 @@ SET(PROJECT_SOURCES
     ModelAPI_Expression.cpp
     ModelAPI_Feature.cpp
     ModelAPI_FeatureValidator.cpp
+    ModelAPI_Folder.cpp
     ModelAPI_IReentrant.cpp
     ModelAPI_Object.cpp
     ModelAPI_Plugin.cpp
     ModelAPI_Result.cpp
     ModelAPI_ResultBody.cpp
-    ModelAPI_ResultCompSolid.cpp
     ModelAPI_ResultConstruction.cpp
     ModelAPI_ResultField.cpp
     ModelAPI_ResultGroup.cpp
@@ -144,7 +144,11 @@ SET(SWIG_LINK_LIBRARIES
   ${PYTHON_LIBRARIES}
 )
 
-SWIG_ADD_MODULE(ModelAPI python ModelAPI.i ${PROJECT_HEADERS})
+IF(${CMAKE_VERSION} VERSION_GREATER "3.8.0")
+  SWIG_ADD_LIBRARY(ModelAPI LANGUAGE python SOURCES ModelAPI.i ${PROJECT_HEADERS})
+ELSE()
+  SWIG_ADD_MODULE(ModelAPI python ModelAPI.i ${PROJECT_HEADERS})
+ENDIF()
 SWIG_LINK_LIBRARIES(ModelAPI ${SWIG_LINK_LIBRARIES})
 
 IF(WIN32)
@@ -172,6 +176,8 @@ ADD_UNIT_TESTS(TestConstants.py
                Test2241.py
                Test2252.py
                Test2276.py
+               Test2389.py
+               Test2391.py
                TestCustomName_BooleanCut.py
                TestCustomName_CommonCompSolid.py
                TestCustomName_CutCompSolid.py
@@ -179,6 +185,7 @@ ADD_UNIT_TESTS(TestConstants.py
                TestCustomName_DefaultName.py
                TestCustomName_ExtrudeFace.py
                TestCustomName_ExtrusionCut.py
+               TestCustomName_ExtrusionCutFace.py
                TestCustomName_MultiTranslation.py
                TestCustomName_Partition.py
                TestCustomName_Placement.py
@@ -186,4 +193,20 @@ ADD_UNIT_TESTS(TestConstants.py
                TestCustomName_Rename.py
                TestCustomName_RotateGroup.py
                TestCustomName_Translation.py
+               TestFolder_Create.py
+               TestFolder_Update.py
+               TestFolder_Remove.py
+               TestFolder_Stability.py
+               TestFolder_CustomName.py
+               Test2358_1.py
+               Test2358_2.py
+               Test2396.py
+               Test2401.py
+               Test2413.py
+               Test2496.py
+               Test2510.py
+               TestFeatureSelection_1.py
+               TestFeatureSelection_2.py
+               Test2607.py
+               TestBlockRecalculation.py
 )