Merge remote branch 'origin/V7_dev'

[modules/gui.git] / src / PVViewer / CMakeLists.txt

diff --git a/src/PVViewer/CMakeLists.txt b/src/PVViewer/CMakeLists.txt
index e7f57b58a464de7f50e9a6e5b9c24dba13b49553..c52d03bf1f5e9c355fa1d875aa4db20515e7f283 100644 (file)
--- a/src/PVViewer/CMakeLists.txt
+++ b/src/PVViewer/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2015  CEA/DEN, EDF R&D
+# Copyright (C) 2014-2016  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
@@ -17,11 +17,11 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(UseQt4Ext)
-
 # Install ParaView filters, etc ...
 ADD_SUBDIRECTORY(resources)
 
+INCLUDE(UseQtExt)
+
 # --- options ---
 
 INCLUDE_DIRECTORIES(
@@ -30,6 +30,7 @@ INCLUDE_DIRECTORIES(
   ${PROJECT_SOURCE_DIR}/src/Qtx
   ${PROJECT_SOURCE_DIR}/src/Event
   ${PROJECT_SOURCE_DIR}/src/PyInterp
+  ${PROJECT_SOURCE_DIR}/src/PVServerService
   ${CMAKE_SOURCE_DIR}/src/LogWindow
   )
 
@@ -44,8 +45,10 @@ SET(_link_LIBRARIES
   PyInterp  
   suit 
   Event 
+  PVServerService
   pqApplicationComponents
-  vtkRenderingFreeTypeOpenGL
+  #vtkRenderingFreeTypeOpenGL
+  vtkRenderingFreeType
   )
 
 # --- headers ---
@@ -63,7 +66,6 @@ SET(_moc_HEADERS
 SET(_other_HEADERS
   PVViewer.h
   PVViewer_LogWindowAdapter.h
-  PVViewer_EngineWrapper.h
   PVViewer_Core.h
 )
 # header files / to install
@@ -79,10 +81,10 @@ SET(_ts_RESOURCES
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 # sources / rcc wrappings
-QT4_ADD_RESOURCES(_rcc_SOURCES ${_rcc_RESOURCES})
+QT_ADD_RESOURCES(_rcc_SOURCES ${_rcc_RESOURCES})
 
 # sources / static
 SET(_other_SOURCES
@@ -92,7 +94,6 @@ SET(_other_SOURCES
   PVViewer_LogWindowAdapter.cxx
   PVViewer_Behaviors.cxx
   PVViewer_GUIElements.cxx
-  PVViewer_EngineWrapper.cxx
   PVViewer_Core.cxx
   )
   
@@ -109,7 +110,7 @@ ADD_LIBRARY(PVViewer ${PVViewer_SOURCES})
 TARGET_LINK_LIBRARIES(PVViewer ${_link_LIBRARIES})
 INSTALL(TARGETS PVViewer EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
-QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GUI_INSTALL_RES_DATA}")
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GUI_INSTALL_RES_DATA}")
 
 # --- header and resources installation ---
 INSTALL(FILES ${PVViewer_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})