X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelAPI%2FCMakeLists.txt;h=90f3e9963a4a1047caa2c7335a81e1182af7c32e;hb=97917d3698f5a2f7fc9596e7c755ff8f6751e373;hp=a5a864cf40a8b750016fbc49072fc895a7376056;hpb=72b9423caaa48805589d6ab87d366f79ecde5bfe;p=modules%2Fshaper.git

diff --git a/src/ModelAPI/CMakeLists.txt b/src/ModelAPI/CMakeLists.txt
index a5a864cf4..90f3e9963 100644
--- a/src/ModelAPI/CMakeLists.txt
+++ b/src/ModelAPI/CMakeLists.txt
@@ -1,22 +1,21 @@
-## 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>
-##
+# Copyright (C) 2014-2019  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
+#
 
 FIND_PACKAGE(SWIG REQUIRED)
 INCLUDE(${SWIG_USE_FILE})
@@ -57,7 +56,6 @@ SET(PROJECT_HEADERS
     ModelAPI_Plugin.h
     ModelAPI_Result.h
     ModelAPI_ResultBody.h
-    ModelAPI_ResultCompSolid.h
     ModelAPI_ResultConstruction.h
     ModelAPI_ResultField.h
     ModelAPI_ResultGroup.h
@@ -101,7 +99,6 @@ SET(PROJECT_SOURCES
     ModelAPI_Plugin.cpp
     ModelAPI_Result.cpp
     ModelAPI_ResultBody.cpp
-    ModelAPI_ResultCompSolid.cpp
     ModelAPI_ResultConstruction.cpp
     ModelAPI_ResultField.cpp
     ModelAPI_ResultGroup.cpp
@@ -146,7 +143,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)
@@ -164,6 +165,7 @@ ADD_UNIT_TESTS(TestConstants.py
                TestResults.py
                TestIntArray.py
                Test1512.py
+               Test1562.py
                TestDoubleArray.py
                Test1757.py
                Test1998.py
@@ -174,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
@@ -191,4 +195,52 @@ ADD_UNIT_TESTS(TestConstants.py
                TestCustomName_Translation.py
                TestFolder_Create.py
                TestFolder_Update.py
+               TestFolder_Remove.py
+               TestFolder_Stability.py
+               TestFolder_CustomName.py
+               TestFolder_Empty.py
+               TestFolder_Sketch.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
+               TestSelectorShell.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
+               TestWeakNamingSortOrder.py
+               Test2685.py
+               TestGeomNamingPlacement.py
+               TestGeomNamingRevolution.py
+               TestGeomNamingEdgeByFilter.py
+               TestGeomNamingSketchPlane.py
+               TestGeomNamingBoxWithFillet.py
+               TestContainerSelector.py
+               TestSaveOpen1.py
+               TestSaveOpen2.py
+               TestSelectionInitialization.py
+               Test2828.py
+               TestSelectionRestore.py
+               Test2491.py
+               Test2493.py
+               Test2627.py
+               Test2859.py
 )