Copyright update 2022

[modules/gui.git] / tools / CMakeLists.txt

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 14ab59f0c1623a06ca7d35966fc7d670c93a1f78..159daf34f323af13a934e491570e052eb35c185b 100644 (file)
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2020  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -24,32 +24,33 @@ ADD_SUBDIRECTORY(dlgfactory)
 ##
 
 IF(SALOME_USE_PYCONSOLE)
-  # Include sub-project PyConsole:
-  SET(TOOLS_EXPORT_NAME ${PROJECT_NAME})
+  # Include sub-project PyConsole
+  SET(PYCONSOLE_SUBPROJECT YES CACHE INTERNAL "")
+  SET(PYINTERP_EXPORT_NAME "${PROJECT_NAME}" CACHE STRING "")
+  SET(PYCONSOLE_EXPORT_NAME "${PROJECT_NAME}" CACHE STRING "")
   SET(PYCONSOLE_INSTALL_LIBS "${SALOME_INSTALL_LIBS}" CACHE PATH "")
+  SET(PYCONSOLE_INSTALL_PYTHON "${SALOME_INSTALL_PYTHON}" CACHE PATH "")
   SET(PYCONSOLE_INSTALL_HEADERS "${SALOME_INSTALL_HEADERS}" CACHE PATH "") 
   SET(PYCONSOLE_INSTALL_RES "${SALOME_GUI_INSTALL_RES_DATA}" CACHE PATH "")
-     
-  ADD_SUBDIRECTORY(../tools/PyConsole) # will bring in PyInterp automatically
-
-  ADD_SUBDIRECTORY(CurvePlot)
-
+  SET(PYCONSOLE_INSTALL_CMAKE "${SALOME_INSTALL_CMAKE_LOCAL}" CACHE PATH "")
+  ADD_SUBDIRECTORY(PyConsole) # brings in PyInterp automatically
+  ADD_SUBDIRECTORY(CurvePlot) # to be refactored (CurvePlot does not directly depend on PyConsole)
 ENDIF(SALOME_USE_PYCONSOLE)
 
 IF(SALOME_USE_PYVIEWER)
-  # Include sub-project PyEditor:
-  SET(TOOLS_EXPORT_NAME ${PROJECT_NAME})
+  # Include sub-project PyEditor
+  SET(PYEDITOR_SUBPROJECT YES CACHE INTERNAL "")
+  SET(PYEDITOR_EXPORT_NAME "${PROJECT_NAME}" CACHE STRING "")
   SET(PYEDITOR_INSTALL_BINS "${SALOME_INSTALL_BINS}" CACHE PATH "")
   SET(PYEDITOR_INSTALL_LIBS "${SALOME_INSTALL_LIBS}" CACHE PATH "")
+  SET(PYEDITOR_INSTALL_PYTHON "${SALOME_INSTALL_PYTHON}" CACHE PATH "")
   SET(PYEDITOR_INSTALL_HEADERS "${SALOME_INSTALL_HEADERS}" CACHE PATH "") 
   SET(PYEDITOR_INSTALL_RES "${SALOME_GUI_INSTALL_RES_DATA}" CACHE PATH "")
+  SET(PYEDITOR_INSTALL_CMAKE "${SALOME_INSTALL_CMAKE_LOCAL}" CACHE PATH "")
   ADD_SUBDIRECTORY(PyEditor)
 ENDIF(SALOME_USE_PYVIEWER)
 
-IF(COMPILER_SUPPORTS_CXX11)
-  SET(TOOLS_EXPORT_NAME ${PROJECT_NAME})
-  SET(REMOTEFILEBROWSER_INSTALL_BINS "${SALOME_INSTALL_BINS}" CACHE PATH "")
-  SET(REMOTEFILEBROWSER_INSTALL_LIBS "${SALOME_INSTALL_LIBS}" CACHE PATH "")
-  SET(REMOTEFILEBROWSER_INSTALL_HEADERS "${SALOME_INSTALL_HEADERS}" CACHE PATH "")
-  ADD_SUBDIRECTORY(RemoteFileBrowser)
-ENDIF(COMPILER_SUPPORTS_CXX11)
+SET(REMOTEFILEBROWSER_INSTALL_BINS "${SALOME_INSTALL_BINS}" CACHE PATH "")
+SET(REMOTEFILEBROWSER_INSTALL_LIBS "${SALOME_INSTALL_LIBS}" CACHE PATH "")
+SET(REMOTEFILEBROWSER_INSTALL_HEADERS "${SALOME_INSTALL_HEADERS}" CACHE PATH "")
+ADD_SUBDIRECTORY(RemoteFileBrowser)