Merge changes from 'master' branch.

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

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 8d608b708b54ac1db9d729aabaede724bc55d5ae..185c427baf4a503cc8f1b2d2974d60ad2c886902 100755 (executable)
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -19,10 +19,6 @@
 
 ADD_SUBDIRECTORY(dlgfactory)
 
-IF(SALOME_USE_VTKVIEWER)
-  ADD_SUBDIRECTORY(vtkEDFOverloads)            
-ENDIF()
-
 ##
 # Python-based packages, part 1 (generic)
 ##
@@ -49,3 +45,10 @@ IF(SALOME_USE_PYVIEWER)
   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)