CMake: exporting properly targets vtkTools and vtkEDFOverloads (needed by PARAVIS)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5f4bb4884565e90767a057e8939571e4378f2df..32c6de2652ef121045588b2cf1d05ea4799e214c 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -230,8 +230,8 @@ SET(_${PROJECT_NAME}_exposed_targets
     OCCViewer OpenGLUtils Plot2d  PyConsole PyInterp  QDS qtx QxScene SalomeApp 
     SalomeIDLGUI  SalomeObject  SalomePrs SalomePyQtGUILight  SalomePyQtGUI 
     SalomePyQt  SalomePy  SalomeSession SalomeStyle SOCC  SPlot2d std SUITApp suit  
-    SUPERVGraph SVTK  ToolsGUI  ViewerTools VTKViewer   vtkTools  SalomeGuiHelpers  
-    SalomeTreeData
+    SUPERVGraph SVTK  ToolsGUI  ViewerTools VTKViewer  vtkTools vtkEDFOverloads SalomeGuiHelpers  
+    SalomeTreeData 
 )
 
 IF(SALOME_BUILD_TESTS)

diff --git a/adm_local/cmake_files/SalomeGUIConfig.cmake.in b/adm_local/cmake_files/SalomeGUIConfig.cmake.in
index c2c0aff05ce7c6a5f4d54bc91f9ec5559d02e86c..2f7618781a4ecbea014ec6ca3539c87dc829ccf9 100644 (file)
--- a/adm_local/cmake_files/SalomeGUIConfig.cmake.in
+++ b/adm_local/cmake_files/SalomeGUIConfig.cmake.in
@@ -157,7 +157,7 @@ SET(GUI_SVTK SVTK)
 SET(GUI_ToolsGUI ToolsGUI)
 SET(GUI_ViewerTools ViewerTools)
 SET(GUI_VTKViewer VTKViewer)
-#SET(GUI_vtkEDFOverloads vtkEDFOverloads ${GUI_ROOT_DIR}/lib/paraview)
+SET(GUI_vtkEDFOverloads vtkEDFOverloads)
 SET(GUI_vtkTools vtkTools)
 SET(GUI_SalomeGuiHelpers SalomeGuiHelpers)
 SET(GUI_SalomeTreeData SalomeTreeData)

diff --git a/tools/vtkEDFOverloads/CMakeLists.txt b/tools/vtkEDFOverloads/CMakeLists.txt
index 4a3144b84edead7a5b0369ef124736495f59998a..b30e9cbecfa6b1f06aa4f165cfa9c714015a502c 100755 (executable)
--- a/tools/vtkEDFOverloads/CMakeLists.txt
+++ b/tools/vtkEDFOverloads/CMakeLists.txt
@@ -21,11 +21,11 @@ INCLUDE(${VTK_USE_FILE})
 
 ADD_LIBRARY(vtkTools vtkEDFCutter.cxx)
 TARGET_LINK_LIBRARIES(vtkTools ${VTK_LIBRARIES})
-INSTALL(TARGETS vtkTools DESTINATION ${SALOME_INSTALL_LIBS})
+INSTALL(TARGETS vtkTools EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
 ADD_LIBRARY(vtkEDFOverloads vtkEDFFactory.cxx)
 TARGET_LINK_LIBRARIES(vtkEDFOverloads ${VTK_LIBRARIES} vtkTools)
-INSTALL(TARGETS vtkEDFOverloads DESTINATION ${SALOME_GUI_INSTALL_PARAVIEW_LIBS})
+INSTALL(TARGETS vtkEDFOverloads EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_GUI_INSTALL_PARAVIEW_LIBS})
 
 FILE(GLOB COMMON_HEADERS_H "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
 INSTALL(FILES ${COMMON_HEADERS_H} DESTINATION ${SALOME_INSTALL_HEADERS})