X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FModelAPI%2FCMakeLists.txt;h=f2947fc56fa5ab0c17204a36c6f204ac764dbbc9;hb=8a2de7e24eee1ca12b846357b5345ebddb8cd13a;hp=e043a23a2731cb5d8bedcb33639334b311749e19;hpb=e7936a7615b6be5d69d4428088e6249f541480b8;p=modules%2Fshaper.git diff --git a/src/ModelAPI/CMakeLists.txt b/src/ModelAPI/CMakeLists.txt index e043a23a2..f2947fc56 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 -## +# Copyright (C) 2014-2020 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,17 +45,22 @@ 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 ModelAPI_Plugin.h ModelAPI_Result.h ModelAPI_ResultBody.h - ModelAPI_ResultCompSolid.h ModelAPI_ResultConstruction.h ModelAPI_ResultField.h ModelAPI_ResultGroup.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,12 +98,13 @@ SET(PROJECT_SOURCES ModelAPI_Expression.cpp ModelAPI_Feature.cpp ModelAPI_FeatureValidator.cpp + ModelAPI_Filter.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 @@ -107,14 +112,14 @@ SET(PROJECT_SOURCES ModelAPI_ResultParameter.cpp ModelAPI_Session.cpp ModelAPI_Tools.cpp - ModelAPI_AttributeValidator.cpp ) SET(PROJECT_LIBRARIES Config GeomAPI + Locale ) -SET(CMAKE_SWIG_FLAGS -threads -Wall) +SET(CMAKE_SWIG_FLAGS -threads -w325,321,362,383,302,403,451,473) ADD_DEFINITIONS(-DMODELAPI_EXPORTS) ADD_LIBRARY(ModelAPI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS}) @@ -125,6 +130,7 @@ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/Config ${PROJECT_SOURCE_DIR}/src/Events ${PROJECT_SOURCE_DIR}/src/GeomAPI ${PROJECT_SOURCE_DIR}/src/GeomAlgoAPI + ${PROJECT_SOURCE_DIR}/src/Locale ) @@ -144,7 +150,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) @@ -162,6 +172,7 @@ ADD_UNIT_TESTS(TestConstants.py TestResults.py TestIntArray.py Test1512.py + Test1562.py TestDoubleArray.py Test1757.py Test1998.py @@ -172,4 +183,85 @@ ADD_UNIT_TESTS(TestConstants.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 + 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 + TestSelectionCircleCenter.py + TestSelectionInPart.py + Test2828.py + TestSelectionRestore.py + Test2491.py + Test2493.py + Test2627.py + Test2859.py + Test2873.py + Test2901.py + Test2903.py + Test3020.py + Test3116.py + Test19019_1.py + Test19019_2.py + Test19031.py + Test19058.py + Test19217.py + Test19707.py + Test19726.py )