X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FCollectionPlugin%2FCMakeLists.txt;h=76b58d020994a10e83f3077ea821af45e477d52e;hb=256fe1dbf23ff64c24028e625ba26e948dcb948f;hp=cfdaaa8e775422ae838d210e569f3b0fff4613ed;hpb=d165b06723a6703ac10ca94f5800f8168379a3ad;p=modules%2Fshaper.git

diff --git a/src/CollectionPlugin/CMakeLists.txt b/src/CollectionPlugin/CMakeLists.txt
index cfdaaa8e7..76b58d020 100644
--- a/src/CollectionPlugin/CMakeLists.txt
+++ b/src/CollectionPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+# Copyright (C) 2014-2022  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
@@ -32,7 +32,10 @@ SET(PROJECT_HEADERS
     CollectionPlugin_Plugin.h
     CollectionPlugin_Group.h
     CollectionPlugin_GroupAddition.h
+    CollectionPlugin_GroupMerge.h
+    CollectionPlugin_GroupShape.h
     CollectionPlugin_GroupIntersection.h
+    CollectionPlugin_GroupOperation.h
     CollectionPlugin_GroupSubstraction.h
     CollectionPlugin_Field.h
     CollectionPlugin_WidgetCreator.h
@@ -48,7 +51,10 @@ SET(PROJECT_SOURCES
     CollectionPlugin_Plugin.cpp
     CollectionPlugin_Group.cpp
     CollectionPlugin_GroupAddition.cpp
+    CollectionPlugin_GroupMerge.cpp
+    CollectionPlugin_GroupShape.cpp
     CollectionPlugin_GroupIntersection.cpp
+    CollectionPlugin_GroupOperation.cpp
     CollectionPlugin_GroupSubstraction.cpp
     CollectionPlugin_Field.cpp
     CollectionPlugin_WidgetCreator.cpp
@@ -66,6 +72,7 @@ SET(XML_RESOURCES
 
 SET(TEXT_RESOURCES
     CollectionPlugin_msg_en.ts
+    CollectionPlugin_msg_fr.ts
 )
 
 # sources / moc wrappings
@@ -75,6 +82,7 @@ QT_WRAP_MOC(PROJECT_AUTOMOC ${PROJECT_MOC_HEADERS})
 
 SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESOURCES} ${QM_RESOURCES})
 SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES})
+SOURCE_GROUP ("XML Files" FILES ${XML_RESOURCES})
 
 
 INCLUDE_DIRECTORIES(
@@ -111,37 +119,23 @@ INSTALL(FILES ${XML_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES})
 INSTALL(DIRECTORY icons/ DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}/icons/Collection)
 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
-)
+include(tests.set)
+
+ADD_UNIT_TESTS(${TEST_NAMES})
+
+if(${HAVE_SALOME})
+  enable_testing()
+  set(TEST_INSTALL_DIRECTORY "${SALOME_SHAPER_INSTALL_TESTS}/CollectionPlugin")
+  
+  install(FILES CTestTestfileInstall.cmake
+  DESTINATION ${TEST_INSTALL_DIRECTORY}
+  RENAME CTestTestfile.cmake)
+  install(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY})
+  
+  set(TMP_TESTS_NAMES)
+  foreach(tfile ${TEST_NAMES})
+    list(APPEND TMP_TESTS_NAMES "Test/${tfile}")
+  endforeach(tfile ${TEST_NAMES})
+  
+  install(FILES ${TMP_TESTS_NAMES} DESTINATION ${TEST_INSTALL_DIRECTORY})
+endif(${HAVE_SALOME})