X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2FExchangePlugin%2FCMakeLists.txt;h=3df98beceac4beaa7da4148038a009671167d085;hb=f51f8ab55887ac6eff49fb9937a460abe1956517;hp=d52a448586b247489f303cbb1af71948e3a2b116;hpb=2c486d0efbe5964698014fbe7e1aea61c9bf2eab;p=modules%2Fshaper.git

diff --git a/src/ExchangePlugin/CMakeLists.txt b/src/ExchangePlugin/CMakeLists.txt
index d52a44858..3df98bece 100644
--- a/src/ExchangePlugin/CMakeLists.txt
+++ b/src/ExchangePlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+# Copyright (C) 2014-2020  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
@@ -22,13 +22,16 @@ INCLUDE(UnitTest)
 
 INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/Events
                     ${PROJECT_SOURCE_DIR}/src/Config
+                    ${PROJECT_SOURCE_DIR}/src/Locale
                     ${PROJECT_SOURCE_DIR}/src/ModelAPI
                     ${PROJECT_SOURCE_DIR}/src/ModelHighAPI
                     ${PROJECT_SOURCE_DIR}/src/GeomAPI
                     ${PROJECT_SOURCE_DIR}/src/GeomAlgoAPI
+                    ${PROJECT_SOURCE_DIR}/src/GeomValidators
                     ${PROJECT_SOURCE_DIR}/src/XAO
                     ${PROJECT_SOURCE_DIR}/src/ConstructionPlugin
                     ${PROJECT_SOURCE_DIR}/src/PartSetPlugin
+                    ${OpenCASCADE_INCLUDE_DIR}
 )
 
 SET(PROJECT_HEADERS
@@ -41,6 +44,7 @@ SET(PROJECT_HEADERS
     ExchangePlugin_Dump.h
     ExchangePlugin_ImportPart.h
     ExchangePlugin_ExportPart.h
+    ExchangePlugin_Import.h
 )
 
 SET(PROJECT_SOURCES
@@ -52,6 +56,7 @@ SET(PROJECT_SOURCES
     ExchangePlugin_Dump.cpp
     ExchangePlugin_ImportPart.cpp
     ExchangePlugin_ExportPart.cpp
+    ExchangePlugin_Import.cpp
 )
 
 SET(XML_RESOURCES
@@ -61,20 +66,39 @@ SET(XML_RESOURCES
 
 SET(TEXT_RESOURCES
     ExchangePlugin_msg_en.ts
+    ExchangePlugin_msg_fr.ts
 )
 
+SOURCE_GROUP ("XML Files" FILES ${XML_RESOURCES})
+SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES})
+
 SET(PROJECT_LIBRARIES
     Events
     Config
+    Locale
     ModelAPI
     ModelHighAPI
     GeomAPI
     GeomAlgoAPI
+    GeomValidators
     XAOShaper
 )
-SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES})
+
+# default dump approaches (will be set if not initialized)
+SET(PYTHONDUMP_NAMING ON  CACHE BOOL "Dump named references to shapes")
+SET(PYTHONDUMP_GEO    ON  CACHE BOOL "Dump references to shapes by the geometric properties")
+SET(PYTHONDUMP_WEAK   OFF CACHE BOOL "Dump weak named references to shapes")
 
 ADD_DEFINITIONS(-DEXCHANGEPLUGIN_EXPORTS)
+IF(${PYTHONDUMP_NAMING})
+  ADD_DEFINITIONS(-DEXCHANGEPLUGIN_DUMP_NAMING)
+ENDIF()
+IF(${PYTHONDUMP_GEO})
+  ADD_DEFINITIONS(-DEXCHANGEPLUGIN_DUMP_GEO)
+ENDIF()
+IF(${PYTHONDUMP_WEAK})
+  ADD_DEFINITIONS(-DEXCHANGEPLUGIN_DUMP_WEAK)
+ENDIF()
 ADD_LIBRARY(ExchangePlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES} ${TEXT_RESOURCES})
 
 TARGET_LINK_LIBRARIES(ExchangePlugin ${PROJECT_LIBRARIES})
@@ -89,6 +113,7 @@ ADD_UNIT_TESTS(
   TestExport.py
   Test2290.py
   Test2459.py
+  Test18710.py
   TestExportToXAOWithFields.py
   TestExportToXAOWithGroupNotUpdated.py
   TestExport_FiniteValidator.py
@@ -107,10 +132,19 @@ ADD_UNIT_TESTS(
   TestExportPart_Results_6.py
   TestExportPart_Results_7.py
   TestExportPart_Results_8.py
+  TestImportPart_AfterCurrent_1.py
+  TestImportPart_AfterCurrent_2.py
+  TestImportPart_AfterLast_1.py
+  TestImportPart_AfterLast_2.py
+  TestImportPart_AfterLast_3.py
+  TestImportPart_AfterLast_4.py
+  TestImportPart_AfterLast_5.py
+  TestImportPart_AfterLast_6.py
   TestImportPart_Construction_1.py
   TestImportPart_Construction_2.py
   TestImportPart_Construction_3.py
   TestImportPart_Construction_4.py
+  TestImportPart_Multiple.py
   TestImportPart_ToEmptyPart.py
   TestImportPart_ToEmptyPartSet.py
 )