X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FCollectionPlugin%2FCMakeLists.txt;h=251b91ffea8ef1c42fcb567da8d9a4604bab0b7f;hb=8038897b81335a9ec1ff08522ff652299cd2ff3f;hp=c1b22136e81a2ee841c4aa599481ed01095a0f5c;hpb=81cc2c23e3109a51d178e63fe5b8a0a4625287b6;p=modules%2Fshaper.git

diff --git a/src/CollectionPlugin/CMakeLists.txt b/src/CollectionPlugin/CMakeLists.txt
index c1b22136e..251b91ffe 100644
--- a/src/CollectionPlugin/CMakeLists.txt
+++ b/src/CollectionPlugin/CMakeLists.txt
@@ -1,35 +1,81 @@
-## Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
+# 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
+#
 
 INCLUDE(Common)
 INCLUDE(UnitTest)
-SET(CMAKE_AUTOMOC ON)
+INCLUDE(UseQtExt)
+
+# additional include directories
+INCLUDE_DIRECTORIES(${QT_INCLUDES})
+
+# additional preprocessor / compiler flags
+ADD_DEFINITIONS(${QT_DEFINITIONS})
 
 SET(PROJECT_HEADERS
     CollectionPlugin.h
     CollectionPlugin_Plugin.h
     CollectionPlugin_Group.h
+    CollectionPlugin_GroupAddition.h
+    CollectionPlugin_GroupIntersection.h
+    CollectionPlugin_GroupOperation.h
+    CollectionPlugin_GroupSubstraction.h
     CollectionPlugin_Field.h
-	CollectionPlugin_WidgetCreator.h
-	CollectionPlugin_WidgetField.h
+    CollectionPlugin_WidgetCreator.h
+    CollectionPlugin_WidgetField.h
+    CollectionPlugin_Validators.h
+)
+
+SET(PROJECT_MOC_HEADERS
+    CollectionPlugin_WidgetField.h
 )
 
 SET(PROJECT_SOURCES
     CollectionPlugin_Plugin.cpp
     CollectionPlugin_Group.cpp
+    CollectionPlugin_GroupAddition.cpp
+    CollectionPlugin_GroupIntersection.cpp
+    CollectionPlugin_GroupOperation.cpp
+    CollectionPlugin_GroupSubstraction.cpp
     CollectionPlugin_Field.cpp
-	CollectionPlugin_WidgetCreator.cpp
-	CollectionPlugin_WidgetField.cpp
+    CollectionPlugin_WidgetCreator.cpp
+    CollectionPlugin_WidgetField.cpp
+    CollectionPlugin_Validators.cpp
 )
 
 SET(XML_RESOURCES
   plugin-Collection.xml
   group_widget.xml
+  group_addition_widget.xml
+  group_intersection_widget.xml
+  group_substraction_widget.xml
 )
 
 SET(TEXT_RESOURCES
     CollectionPlugin_msg_en.ts
 )
 
+# sources / moc wrappings
+QT_WRAP_MOC(PROJECT_AUTOMOC ${PROJECT_MOC_HEADERS})
+
+#QT5_ADD_TRANSLATION(QM_RESOURCES ${TEXT_RESOURCES})
+
+SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESOURCES} ${QM_RESOURCES})
 SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES})
 
 
@@ -41,7 +87,7 @@ INCLUDE_DIRECTORIES(
   ../Events
   ../ModuleBase
   ../Config
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
 )
 
 SET(PROJECT_LIBRARIES
@@ -53,8 +99,13 @@ SET(PROJECT_LIBRARIES
     ModuleBase
 )
 
-ADD_DEFINITIONS(-DCOLLECTIONPLUGIN_EXPORTS ${CAS_DEFINITIONS})
-ADD_LIBRARY(CollectionPlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES} ${TEXT_RESOURCES})
+ADD_DEFINITIONS(-DCOLLECTIONPLUGIN_EXPORTS ${OpenCASCADE_DEFINITIONS})
+ADD_LIBRARY(CollectionPlugin MODULE
+            ${PROJECT_SOURCES}
+            ${PROJECT_HEADERS}
+            ${XML_RESOURCES}
+            ${TEXT_RESOURCES}
+            ${PROJECT_AUTOMOC})
 TARGET_LINK_LIBRARIES(CollectionPlugin ${PROJECT_LIBRARIES})
 
 INSTALL(TARGETS CollectionPlugin DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES})
@@ -64,5 +115,36 @@ INSTALL(FILES ${TEXT_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES})
 
 ADD_UNIT_TESTS(
                TestGroup.py
+               TestGroup2.py
                TestField.py
+               TestGroup1799.py
+               TestGroupMove01.py
+               TestGroupMove02.py
+               TestGroupMove03.py
+               TestGroupMove04.py
+               TestGroupMove05.py
+               TestGroupMove06.py
+               TestGroupMove07.py
+               TestGroupMove08.py
+               TestGroupMove09.py
+               TestGroupMove10.py
+               TestGroupMove11.py
+               TestGroupMove12.py
+               TestGroupMove13.py
+               TestGroupMove14.py
+               TestGroupMove15.py
+               TestGroupMove16.py
+               TestGroupMove17.py
+               TestGroupMove18.py
+               TestGroupMove19.py
+               TestGroupMove20.py
+               TestGroupShareTopology.py
+               TestGroupAddition.py
+               TestGroupAddition_Error.py
+               TestGroupIntersection.py
+               TestGroupIntersection_Error.py
+               TestGroupSubstraction.py
+               TestGroupSubstraction_Error1.py
+               TestGroupSubstraction_Error2.py
+               Test2977.py
 )