X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FCollectionPlugin%2FCMakeLists.txt;h=1a3850582f22c1fd4a6274006f977860d9b6c44f;hb=06e7f5859095193fc7f498bd89a7d28009794f53;hp=fa72858f47a8bce9e6e86d7c323990b357d1b329;hpb=dc3179a97b53efd292bb7d2a6280e7cf5e3e7885;p=modules%2Fshaper.git

diff --git a/src/CollectionPlugin/CMakeLists.txt b/src/CollectionPlugin/CMakeLists.txt
index fa72858f4..1a3850582 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-2023  CEA, EDF
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -32,6 +32,8 @@ 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
@@ -49,6 +51,8 @@ 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
@@ -68,6 +72,7 @@ SET(XML_RESOURCES
 
 SET(TEXT_RESOURCES
     CollectionPlugin_msg_en.ts
+    CollectionPlugin_msg_fr.ts
 )
 
 # sources / moc wrappings
@@ -77,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(
@@ -113,41 +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
-               TestGroupSubstraction2.py
-               TestGroupSubstraction_Error1.py
-               TestGroupSubstraction_Error2.py
-               Test2977.py
-               TestGroupWholeResult1.py
-               TestGroupWholeResult2.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})