-# Copyright (C) 2010-2014 CEA/DEN, EDF R&D
+# Copyright (C) 2014-2019 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
# 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/Qtx
+ ${PROJECT_SOURCE_DIR}/src/SUIT
+ ${PROJECT_SOURCE_DIR}/src/PVServerService
)
-ADD_DEFINITIONS(${KERNEL_DEFINITIONS})
-ADD_DEFINITIONS(${OMNIORB_DEFINITIONS} ${PYTHON_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}
- vtkRenderingFreeTypeOpenGL
-)
+ ${KERNEL_SALOMELocalTrace}
+ ${KERNEL_OpUtil}
+ suit
+ PVServerService
+ pqApplicationComponents
+ #vtkRenderingFreeTypeOpenGL
+ vtkRenderingFreeType
+ vtkInteractionStyle
+ )
# --- headers ---
PVViewer_ViewWindow.h
PVViewer_Behaviors.h
PVViewer_GUIElements.h
+ PVViewer_InitSingleton.h
)
# header files / no moc processing
SET(_other_HEADERS
PVViewer.h
- PVViewer_LogWindowAdapter.h
- PVViewer_EngineWrapper.h
+ PVViewer_OutputWindow.h
+ PVViewer_Core.h
)
# header files / to install
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
PVViewer_ViewManager.cxx
PVViewer_ViewModel.cxx
PVViewer_ViewWindow.cxx
- PVViewer_LogWindowAdapter.cxx
+ PVViewer_OutputWindow.cxx
PVViewer_Behaviors.cxx
PVViewer_GUIElements.cxx
- PVViewer_EngineWrapper.cxx
+ PVViewer_Core.cxx
+ PVViewer_InitSingleton.cxx
)
# sources / to compile
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})