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
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
[modules/shaper.git]
/
src
/
FeaturesPlugin
/
CMakeLists.txt
diff --git
a/src/FeaturesPlugin/CMakeLists.txt
b/src/FeaturesPlugin/CMakeLists.txt
index 4b4ce8e1152d74069b12a395d11073e9dfd074b2..dfce818692f42196c7178c22cd9bb557108a545f 100644
(file)
--- a/
src/FeaturesPlugin/CMakeLists.txt
+++ b/
src/FeaturesPlugin/CMakeLists.txt
@@
-1,3
+1,5
@@
+## Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
+
INCLUDE(Common)
INCLUDE(UnitTest)
INCLUDE(Common)
INCLUDE(UnitTest)
@@
-5,8
+7,9
@@
SET(PROJECT_HEADERS
FeaturesPlugin.h
FeaturesPlugin_Plugin.h
FeaturesPlugin_Extrusion.h
FeaturesPlugin.h
FeaturesPlugin_Plugin.h
FeaturesPlugin_Extrusion.h
- FeaturesPlugin_Boolean.h
- FeaturesPlugin_Group.h
+ FeaturesPlugin_Boolean.h
+ FeaturesPlugin_Group.h
+ FeaturesPlugin_Placement.h
)
SET(PROJECT_SOURCES
)
SET(PROJECT_SOURCES
@@
-14,6
+17,7
@@
SET(PROJECT_SOURCES
FeaturesPlugin_Extrusion.cpp
FeaturesPlugin_Boolean.cpp
FeaturesPlugin_Group.cpp
FeaturesPlugin_Extrusion.cpp
FeaturesPlugin_Boolean.cpp
FeaturesPlugin_Group.cpp
+ FeaturesPlugin_Placement.cpp
)
SET(XML_RESOURCES
)
SET(XML_RESOURCES
@@
-21,6
+25,7
@@
SET(XML_RESOURCES
extrusion_widget.xml
boolean_widget.xml
group_widget.xml
extrusion_widget.xml
boolean_widget.xml
group_widget.xml
+ placement_widget.xml
)
INCLUDE_DIRECTORIES(
)
INCLUDE_DIRECTORIES(
@@
-45,4
+50,6
@@
INSTALL(TARGETS FeaturesPlugin DESTINATION plugins)
INSTALL(FILES ${XML_RESOURCES} DESTINATION plugins)
ADD_UNIT_TESTS(TestExtrusion.py
INSTALL(FILES ${XML_RESOURCES} DESTINATION plugins)
ADD_UNIT_TESTS(TestExtrusion.py
- TestBoolean.py)
+ TestBoolean.py
+ TestGroup.py
+ TestMultiBoolean.py)