X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelAPI%2FCMakeLists.txt;h=1ef43263f40abdae8a3f11daf77b0c21f49d7d9c;hb=2e0f664e66dc2b46796df2953f52871b10799173;hp=22b949c54246424129624587d7063bf6f956c6d3;hpb=c96bffd906d920ec218762045d208d54834be7ba;p=modules%2Fshaper.git

diff --git a/src/ModelAPI/CMakeLists.txt b/src/ModelAPI/CMakeLists.txt
index 22b949c54..1ef43263f 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})
@@ -46,11 +45,16 @@ SET(PROJECT_HEADERS
     ModelAPI_CompositeFeature.h
     ModelAPI_Data.h
     ModelAPI_Document.h
+    ModelAPI_Entity.h
     ModelAPI_EventReentrantMessage.h
     ModelAPI_Events.h
     ModelAPI_Expression.h
     ModelAPI_Feature.h
     ModelAPI_FeatureValidator.h
+    ModelAPI_Filter.h
+    ModelAPI_FiltersArgs.h
+    ModelAPI_FiltersFactory.h
+    ModelAPI_FiltersFeature.h
     ModelAPI_Folder.h
     ModelAPI_IReentrant.h
     ModelAPI_Object.h
@@ -65,7 +69,6 @@ SET(PROJECT_HEADERS
     ModelAPI_Session.h
     ModelAPI_Tools.h
     ModelAPI_Validator.h
-    ModelAPI_Entity.h
 )
 
 SET(PROJECT_SOURCES
@@ -85,6 +88,7 @@ SET(PROJECT_SOURCES
     ModelAPI_AttributeString.cpp
     ModelAPI_AttributeStringArray.cpp
     ModelAPI_AttributeTables.cpp
+    ModelAPI_AttributeValidator.cpp
     ModelAPI_BodyBuilder.cpp
     ModelAPI_CompositeFeature.cpp
     ModelAPI_Data.cpp
@@ -94,6 +98,7 @@ SET(PROJECT_SOURCES
     ModelAPI_Expression.cpp
     ModelAPI_Feature.cpp
     ModelAPI_FeatureValidator.cpp
+    ModelAPI_Filter.cpp
     ModelAPI_Folder.cpp
     ModelAPI_IReentrant.cpp
     ModelAPI_Object.cpp
@@ -107,14 +112,13 @@ SET(PROJECT_SOURCES
     ModelAPI_ResultParameter.cpp
     ModelAPI_Session.cpp
     ModelAPI_Tools.cpp
-    ModelAPI_AttributeValidator.cpp
 )
 
 SET(PROJECT_LIBRARIES
     Config
     GeomAPI
 )
-SET(CMAKE_SWIG_FLAGS -threads -Wall)
+SET(CMAKE_SWIG_FLAGS -threads -w325,321,362,383,302,403,473)
 ADD_DEFINITIONS(-DMODELAPI_EXPORTS)
 
 ADD_LIBRARY(ModelAPI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
@@ -199,6 +203,8 @@ ADD_UNIT_TESTS(TestConstants.py
                TestFolder_Remove.py
                TestFolder_Stability.py
                TestFolder_CustomName.py
+               TestFolder_Empty.py
+               TestFolder_Sketch.py
                Test2358_1.py
                Test2358_2.py
                Test2396.py
@@ -225,6 +231,7 @@ ADD_UNIT_TESTS(TestConstants.py
                TestWeakNaming2445.py
                TestWeakNaming2446.py
                TestWeakNaming2452.py
+               TestWeakNamingSortOrder.py
                Test2685.py
                TestGeomNamingPlacement.py
                TestGeomNamingRevolution.py
@@ -232,5 +239,19 @@ ADD_UNIT_TESTS(TestConstants.py
                TestGeomNamingSketchPlane.py
                TestGeomNamingBoxWithFillet.py
                TestContainerSelector.py
-               TestSaveOpen.py
+               TestSaveOpen1.py
+               TestSaveOpen2.py
+               TestSelectionInitialization.py
+               TestSelectionCircleCenter.py
+               TestSelectionInPart.py
+               Test2828.py
+               TestSelectionRestore.py
+               Test2491.py
+               Test2493.py
+               Test2627.py
+               Test2859.py
+               Test2873.py
+               Test2901.py
+               Test2903.py
+               Test3020.py
 )