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 8a43e577c36e7eb3fdc0ff265c5e4d4921c8a84a..c52d03bf1f5e9c355fa1d875aa4db20515e7f283 100644 (file)
--- a/src/PVViewer/CMakeLists.txt
+++ b/src/PVViewer/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2014  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,38 +17,39 @@
 # 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(${GUI_INCLUDE_DIRS} 
-    ${QT_INCLUDES}
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src/SUIT
-    ${CMAKE_SOURCE_DIR}/src/CAM
-    ${CMAKE_SOURCE_DIR}/src/STD
-    ${CMAKE_SOURCE_DIR}/src/Qtx
-    ${CMAKE_SOURCE_DIR}/src/Event
-    ${CMAKE_SOURCE_DIR}/src/PyInterp
-    ${CMAKE_SOURCE_DIR}/src/PyConsole
-    ${CMAKE_SOURCE_DIR}/src/LogWindow
-    )
-
-SET(_PARAVIEW_APP_COMPO_LIB
-  pqApplicationComponents
+INCLUDE_DIRECTORIES(
+  ${PROJECT_SOURCE_DIR}/src/SUIT
+  ${PROJECT_SOURCE_DIR}/src/STD
+  ${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
   )
 
-ADD_DEFINITIONS(${KERNEL_DEFINITIONS})
-ADD_DEFINITIONS(${OMNIORB_DEFINITIONS})
+ADD_DEFINITIONS(
+  ${KERNEL_DEFINITIONS}
+  ${PYTHON_DEFINITIONS}
+  )
 
 SET(_link_LIBRARIES 
-  ${KERNEL_LDFLAGS} ${KERNEL_SALOMELocalTrace} ${KERNEL_OpUtil} 
-  ${GUI_LDFLAGS} suit Event PyInterp 
-  ${_PARAVIEW_APP_COMPO_LIB}
-)
+  ${KERNEL_SALOMELocalTrace} 
+  ${KERNEL_OpUtil}
+  PyInterp  
+  suit 
+  Event 
+  PVServerService
+  pqApplicationComponents
+  #vtkRenderingFreeTypeOpenGL
+  vtkRenderingFreeType
+  )
 
 # --- headers ---
 
@@ -63,8 +64,9 @@ SET(_moc_HEADERS
 
 # header files / no moc processing
 SET(_other_HEADERS
+  PVViewer.h
   PVViewer_LogWindowAdapter.h
-  PVViewer_EngineWrapper.h
+  PVViewer_Core.h
 )
 # header files / to install
 SET(PVViewer_HEADERS ${_moc_HEADERS} ${_other_HEADERS})
@@ -72,15 +74,17 @@ SET(PVViewer_HEADERS ${_moc_HEADERS} ${_other_HEADERS})
 # resource files / to be processed by lrelease
 SET(_ts_RESOURCES
   resources/PVViewer_msg_en.ts
+  resources/PVViewer_msg_ja.ts
+  resources/PVViewer_msg_fr.ts
 )
 
 # --- 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
@@ -90,7 +94,7 @@ SET(_other_SOURCES
   PVViewer_LogWindowAdapter.cxx
   PVViewer_Behaviors.cxx
   PVViewer_GUIElements.cxx
-  PVViewer_EngineWrapper.cxx
+  PVViewer_Core.cxx
   )
   
 # sources / to compile
@@ -106,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})