0054504: Exception when accessing VTK renderer with libSalomePy module

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

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 1ca8dc33bda54dae129c17191b46c0e114275ef0..185c427baf4a503cc8f1b2d2974d60ad2c886902 100755 (executable)
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -19,21 +19,36 @@
 
 ADD_SUBDIRECTORY(dlgfactory)
 
-IF(SALOME_USE_VTKVIEWER)
-  ADD_SUBDIRECTORY(vtkEDFOverloads)            
-ENDIF()
-
 ##
 # Python-based packages, part 1 (generic)
 ##
+
 IF(SALOME_USE_PYCONSOLE)
   # Include sub-project PyConsole:
   SET(TOOLS_EXPORT_NAME ${PROJECT_NAME})
-  SET(PYCONSOLE_INSTALL_LIBS "${SALOME_INSTALL_LIBS}")
-  SET(PYCONSOLE_INSTALL_HEADERS "${SALOME_INSTALL_HEADERS}") 
-  SET(PYCONSOLE_INSTALL_RES "${SALOME_GUI_INSTALL_RES_DATA}")
-  OPTION(PYCONSOLE_BUILD_WITH_QT5 "Build PYCONSOLE with Qt 5" ${SALOME_BUILD_WITH_QT5})
+  SET(PYCONSOLE_INSTALL_LIBS "${SALOME_INSTALL_LIBS}" CACHE PATH "")
+  SET(PYCONSOLE_INSTALL_HEADERS "${SALOME_INSTALL_HEADERS}" CACHE PATH "") 
+  SET(PYCONSOLE_INSTALL_RES "${SALOME_GUI_INSTALL_RES_DATA}" CACHE PATH "")
+  OPTION(PYCONSOLE_BUILD_WITH_QT5 "Build PyConsole with Qt 5" ${SALOME_BUILD_WITH_QT5})
      
   ADD_SUBDIRECTORY(../tools/PyConsole) # will bring in PyInterp automatically
 ENDIF(SALOME_USE_PYCONSOLE)
 
+IF(SALOME_USE_PYVIEWER)
+  # Include sub-project PyEditor:
+  SET(TOOLS_EXPORT_NAME ${PROJECT_NAME})
+  SET(PYEDITOR_INSTALL_BINS "${SALOME_INSTALL_BINS}" CACHE PATH "")
+  SET(PYEDITOR_INSTALL_LIBS "${SALOME_INSTALL_LIBS}" CACHE PATH "")
+  SET(PYEDITOR_INSTALL_HEADERS "${SALOME_INSTALL_HEADERS}" CACHE PATH "") 
+  SET(PYEDITOR_INSTALL_RES "${SALOME_GUI_INSTALL_RES_DATA}" CACHE PATH "")
+  OPTION(PYEDITOR_BUILD_WITH_QT5 "Build PyEditor with Qt 5" ${SALOME_BUILD_WITH_QT5})
+  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)