X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelAPI%2FCMakeLists.txt;h=68b34a17718cdbc45fd0fb9155d4f5e2ed63b625;hb=11b409dbd9619352ea7fb5732aba991e6c65aef8;hp=27bf507126f6c65d5064aecd04f5de07aa58e351;hpb=f3091c70ae80771d3bf86f8b0efcd529934e0442;p=modules%2Fshaper.git diff --git a/src/ModelAPI/CMakeLists.txt b/src/ModelAPI/CMakeLists.txt index 27bf50712..68b34a177 100644 --- a/src/ModelAPI/CMakeLists.txt +++ b/src/ModelAPI/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2014-2019 CEA/DEN, EDF R&D +# 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 @@ -45,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 @@ -64,7 +69,6 @@ SET(PROJECT_HEADERS ModelAPI_Session.h ModelAPI_Tools.h ModelAPI_Validator.h - ModelAPI_Entity.h ) SET(PROJECT_SOURCES @@ -84,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 @@ -93,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 @@ -106,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 -w325,321,362,383,302,403,473) +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}) @@ -124,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 ) @@ -237,6 +244,8 @@ ADD_UNIT_TESTS(TestConstants.py TestSaveOpen1.py TestSaveOpen2.py TestSelectionInitialization.py + TestSelectionCircleCenter.py + TestSelectionInPart.py Test2828.py TestSelectionRestore.py Test2491.py @@ -246,4 +255,17 @@ ADD_UNIT_TESTS(TestConstants.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 + Test19912.py + Test19932.py + Test19989.py + Test20170.py )