X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelAPI%2FCMakeLists.txt;h=058e2de5161b1240a12ccb12136d85cf7e9bccca;hb=88ee9b2b81cf93a6324336b57e30cc8a3a487499;hp=a1894001e694def50b1455874b06ddf7c73ec1db;hpb=77d6e03555d0d46232e09ace4178f66f8c9b40ee;p=modules%2Fshaper.git

diff --git a/src/ModelAPI/CMakeLists.txt b/src/ModelAPI/CMakeLists.txt
index a1894001e..058e2de51 100644
--- a/src/ModelAPI/CMakeLists.txt
+++ b/src/ModelAPI/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
@@ -26,6 +26,7 @@ SET(PROJECT_HEADERS
     ModelAPI.h
     ModelAPI_Attribute.h
     ModelAPI_AttributeBoolean.h
+    ModelAPI_AttributeImage.h
     ModelAPI_AttributeIntArray.h
     ModelAPI_AttributeDocRef.h
     ModelAPI_AttributeDouble.h
@@ -74,6 +75,7 @@ SET(PROJECT_HEADERS
 SET(PROJECT_SOURCES
     ModelAPI_Attribute.cpp
     ModelAPI_AttributeBoolean.cpp
+    ModelAPI_AttributeImage.cpp
     ModelAPI_AttributeIntArray.cpp
     ModelAPI_AttributeDocRef.cpp
     ModelAPI_AttributeDouble.cpp
@@ -117,10 +119,15 @@ SET(PROJECT_SOURCES
 SET(PROJECT_LIBRARIES
     Config
     GeomAPI
+    Locale
 )
 SET(CMAKE_SWIG_FLAGS -threads -w325,321,362,383,302,403,451,473)
 ADD_DEFINITIONS(-DMODELAPI_EXPORTS)
 
+IF(TKTInspector)
+    ADD_DEFINITIONS(-DTINSPECTOR)
+ENDIF()
+
 ADD_LIBRARY(ModelAPI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
 SET_TARGET_PROPERTIES(ModelAPI PROPERTIES LINKER_LANGUAGE CXX)
 TARGET_LINK_LIBRARIES(ModelAPI ${PROJECT_LIBRARIES})
@@ -129,6 +136,8 @@ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/Config
                     ${PROJECT_SOURCE_DIR}/src/Events
                     ${PROJECT_SOURCE_DIR}/src/GeomAPI
                     ${PROJECT_SOURCE_DIR}/src/GeomAlgoAPI
+                    ${PROJECT_SOURCE_DIR}/src/Locale
+                    ${OpenCASCADE_INCLUDE_DIR}
 )
 
 
@@ -163,95 +172,23 @@ INSTALL(TARGETS _ModelAPI DESTINATION ${SHAPER_INSTALL_SWIG})
 INSTALL(TARGETS ModelAPI DESTINATION ${SHAPER_INSTALL_BIN})
 INSTALL(FILES ${SWIG_SCRIPTS} DESTINATION ${SHAPER_INSTALL_SWIG})
 
-ADD_UNIT_TESTS(TestConstants.py
-               TestUndoRedo.py
-               TestDocument.py
-               Test1064.py
-               TestResults.py
-               TestIntArray.py
-               Test1512.py
-               Test1562.py
-               TestDoubleArray.py
-               Test1757.py
-               Test1998.py
-               Test1995.py
-               Test2170.py
-               TestExternalConstruction.py
-               Test2228.py
-               Test2241.py
-               Test2252.py
-               Test2276.py
-               Test2389.py
-               Test2391.py
-               TestCustomName_BooleanCut.py
-               TestCustomName_CommonCompSolid.py
-               TestCustomName_CutCompSolid.py
-               TestCustomName_CutGroup.py
-               TestCustomName_DefaultName.py
-               TestCustomName_ExtrudeFace.py
-               TestCustomName_ExtrusionCut.py
-               TestCustomName_ExtrusionCutFace.py
-               TestCustomName_MultiTranslation.py
-               TestCustomName_Partition.py
-               TestCustomName_Placement.py
-               TestCustomName_Recover.py
-               TestCustomName_Rename.py
-               TestCustomName_RotateGroup.py
-               TestCustomName_Translation.py
-               TestFolder_Create.py
-               TestFolder_Update.py
-               TestFolder_Remove.py
-               TestFolder_Stability.py
-               TestFolder_CustomName.py
-               TestFolder_Empty.py
-               TestFolder_Sketch.py
-               Test2358_1.py
-               Test2358_2.py
-               Test2396.py
-               Test2401.py
-               Test2413.py
-               Test2496.py
-               Test2510.py
-               TestFeatureSelection_1.py
-               TestFeatureSelection_2.py
-               Test2607.py
-               TestBlockRecalculation.py
-               TestSelectionScope.py
-               TestSelectorShell.py
-               TestWeakNaming2125.py
-               TestWeakNaming2222.py
-               TestWeakNaming2245.py
-               TestWeakNaming2247.py
-               TestWeakNaming2248.py
-               TestWeakNaming2261.py
-               TestWeakNaming2291.py
-               TestWeakNaming2335.py
-               TestWeakNaming2375.py
-               TestWeakNaming2437.py
-               TestWeakNaming2445.py
-               TestWeakNaming2446.py
-               TestWeakNaming2452.py
-               TestWeakNamingSortOrder.py
-               Test2685.py
-               TestGeomNamingPlacement.py
-               TestGeomNamingRevolution.py
-               TestGeomNamingEdgeByFilter.py
-               TestGeomNamingSketchPlane.py
-               TestGeomNamingBoxWithFillet.py
-               TestContainerSelector.py
-               TestSaveOpen1.py
-               TestSaveOpen2.py
-               TestSelectionInitialization.py
-               TestSelectionCircleCenter.py
-               TestSelectionInPart.py
-               Test2828.py
-               TestSelectionRestore.py
-               Test2491.py
-               Test2493.py
-               Test2627.py
-               Test2859.py
-               Test2873.py
-               Test2901.py
-               Test2903.py
-               Test3020.py
-)
+include(tests.set)
+
+ADD_UNIT_TESTS(${TEST_NAMES})
+
+if(${HAVE_SALOME})
+  enable_testing()
+  set(TEST_INSTALL_DIRECTORY "${SALOME_SHAPER_INSTALL_TESTS}/ModelAPI")
+  
+  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})