Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix compilation error.
[modules/shaper.git]
/
src
/
ModelAPI
/
CMakeLists.txt
diff --git
a/src/ModelAPI/CMakeLists.txt
b/src/ModelAPI/CMakeLists.txt
index 58249a22192e844bd8a5ffe50c9e218d4a244ac1..f2947fc56fa5ab0c17204a36c6f204ac764dbbc9 100644
(file)
--- a/
src/ModelAPI/CMakeLists.txt
+++ b/
src/ModelAPI/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2014-20
19
CEA/DEN, EDF R&D
+# Copyright (C) 2014-20
20
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
#
# 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_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_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_Folder.h
ModelAPI_IReentrant.h
ModelAPI_Object.h
@@
-64,8
+69,6
@@
SET(PROJECT_HEADERS
ModelAPI_Session.h
ModelAPI_Tools.h
ModelAPI_Validator.h
ModelAPI_Session.h
ModelAPI_Tools.h
ModelAPI_Validator.h
- ModelAPI_Entity.h
- ModelAPI_Filter.h
)
SET(PROJECT_SOURCES
)
SET(PROJECT_SOURCES
@@
-85,6
+88,7
@@
SET(PROJECT_SOURCES
ModelAPI_AttributeString.cpp
ModelAPI_AttributeStringArray.cpp
ModelAPI_AttributeTables.cpp
ModelAPI_AttributeString.cpp
ModelAPI_AttributeStringArray.cpp
ModelAPI_AttributeTables.cpp
+ ModelAPI_AttributeValidator.cpp
ModelAPI_BodyBuilder.cpp
ModelAPI_CompositeFeature.cpp
ModelAPI_Data.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_Expression.cpp
ModelAPI_Feature.cpp
ModelAPI_FeatureValidator.cpp
+ ModelAPI_Filter.cpp
ModelAPI_Folder.cpp
ModelAPI_IReentrant.cpp
ModelAPI_Object.cpp
ModelAPI_Folder.cpp
ModelAPI_IReentrant.cpp
ModelAPI_Object.cpp
@@
-107,14
+112,14
@@
SET(PROJECT_SOURCES
ModelAPI_ResultParameter.cpp
ModelAPI_Session.cpp
ModelAPI_Tools.cpp
ModelAPI_ResultParameter.cpp
ModelAPI_Session.cpp
ModelAPI_Tools.cpp
- ModelAPI_AttributeValidator.cpp
)
SET(PROJECT_LIBRARIES
Config
GeomAPI
)
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,4
51,4
73)
ADD_DEFINITIONS(-DMODELAPI_EXPORTS)
ADD_LIBRARY(ModelAPI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
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/Events
${PROJECT_SOURCE_DIR}/src/GeomAPI
${PROJECT_SOURCE_DIR}/src/GeomAlgoAPI
+ ${PROJECT_SOURCE_DIR}/src/Locale
)
)
@@
-238,6
+244,8
@@
ADD_UNIT_TESTS(TestConstants.py
TestSaveOpen1.py
TestSaveOpen2.py
TestSelectionInitialization.py
TestSaveOpen1.py
TestSaveOpen2.py
TestSelectionInitialization.py
+ TestSelectionCircleCenter.py
+ TestSelectionInPart.py
Test2828.py
TestSelectionRestore.py
Test2491.py
Test2828.py
TestSelectionRestore.py
Test2491.py
@@
-247,4
+255,13
@@
ADD_UNIT_TESTS(TestConstants.py
Test2873.py
Test2901.py
Test2903.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
)
)