X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelAPI%2FCMakeLists.txt;h=9c003d1a9b66280b59c4c76179efe1c57f1aac2a;hb=e488ac86216de60a09d04e104d8d8fb6143f4063;hp=60036bc80df724a67aeba9462d08d4a482442048;hpb=02fc4b8cac85322c7bb8c5a00f7fafa3665a0fc6;p=modules%2Fshaper.git

diff --git a/src/ModelAPI/CMakeLists.txt b/src/ModelAPI/CMakeLists.txt
index 60036bc80..9c003d1a9 100644
--- a/src/ModelAPI/CMakeLists.txt
+++ b/src/ModelAPI/CMakeLists.txt
@@ -1,4 +1,22 @@
-## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+## Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+##
+## This library is free software; you can redistribute it and/or
+## modify it under the terms of the GNU Lesser General Public
+## License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+##
+## This library is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this library; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
+## See http:##www.salome-platform.org/ or
+## email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+##
 
 FIND_PACKAGE(SWIG REQUIRED)
 INCLUDE(${SWIG_USE_FILE})
@@ -21,21 +39,26 @@ SET(PROJECT_HEADERS
     ModelAPI_AttributeSelection.h
     ModelAPI_AttributeSelectionList.h
     ModelAPI_AttributeString.h
+    ModelAPI_AttributeStringArray.h
+    ModelAPI_AttributeTables.h
     ModelAPI_AttributeValidator.h
     ModelAPI_BodyBuilder.h
     ModelAPI_CompositeFeature.h
     ModelAPI_Data.h
     ModelAPI_Document.h
+    ModelAPI_EventReentrantMessage.h
     ModelAPI_Events.h
     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
     ModelAPI_ResultParameter.h
     ModelAPI_ResultPart.h
@@ -60,20 +83,25 @@ SET(PROJECT_SOURCES
     ModelAPI_AttributeSelection.cpp
     ModelAPI_AttributeSelectionList.cpp
     ModelAPI_AttributeString.cpp
+    ModelAPI_AttributeStringArray.cpp
+    ModelAPI_AttributeTables.cpp
     ModelAPI_BodyBuilder.cpp
     ModelAPI_CompositeFeature.cpp
     ModelAPI_Data.cpp
     ModelAPI_Document.cpp
+    ModelAPI_EventReentrantMessage.cpp
     ModelAPI_Events.cpp
     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
     ModelAPI_ResultPart.cpp
     ModelAPI_ResultParameter.cpp
@@ -84,6 +112,7 @@ SET(PROJECT_SOURCES
 
 SET(PROJECT_LIBRARIES
     Config
+    GeomAPI
 )
 SET(CMAKE_SWIG_FLAGS -threads -Wall)
 ADD_DEFINITIONS(-DMODELAPI_EXPORTS)
@@ -115,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)
@@ -131,4 +164,69 @@ ADD_UNIT_TESTS(TestConstants.py
                TestDocument.py
                Test1064.py
                TestResults.py
-               Test1512.py)
+               TestIntArray.py
+               Test1512.py
+               Test1562.py
+               TestDoubleArray.py
+               Test1757.py
+               Test1998.py
+               Test1995.py
+               Test2170.py
+               TestExternalConstruction.py
+               Test2228.py
+               Test2241.py
+               Test2252.py
+               Test2276.py
+               Test2389.py
+               Test2391.py
+               TestCustomName_BooleanCut.py
+               TestCustomName_CommonCompSolid.py
+               TestCustomName_CutCompSolid.py
+               TestCustomName_CutGroup.py
+               TestCustomName_DefaultName.py
+               TestCustomName_ExtrudeFace.py
+               TestCustomName_ExtrusionCut.py
+               TestCustomName_ExtrusionCutFace.py
+               TestCustomName_MultiTranslation.py
+               TestCustomName_Partition.py
+               TestCustomName_Placement.py
+               TestCustomName_Recover.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
+               TestSelectionScope.py
+               TestWeakNaming2125.py
+               TestWeakNaming2222.py
+               TestWeakNaming2245.py
+               TestWeakNaming2247.py
+               TestWeakNaming2248.py
+               TestWeakNaming2261.py
+               TestWeakNaming2291.py
+               TestWeakNaming2335.py
+               TestWeakNaming2375.py
+               TestWeakNaming2437.py
+               TestWeakNaming2445.py
+               TestWeakNaming2446.py
+               TestWeakNaming2452.py
+               Test2685.py
+               TestGeomNamingPlacement.py
+               TestGeomNamingRevolution.py
+               TestGeomNamingEdgeByFilter.py
+               TestGeomNamingSketchPlane.py
+)