Porting to ParaView 5.8: additional changes

This commit is contained in:
vsr 2020-02-28 09:07:51 +03:00
parent d0aec7b7d4
commit a00e0f1e49
17 changed files with 0 additions and 19 deletions

View File

@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}

View File

@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}

View File

@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}

View File

@ -22,7 +22,6 @@
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}

View File

@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OPENCV_INCLUDE_DIR} ${OPENCV_INCLUDE_DIR}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}

View File

@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}

View File

@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}

View File

@ -25,7 +25,6 @@ INCLUDE(${SWIG_USE_FILE})
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${QT_INCLUDE_DIRS} ${QT_INCLUDE_DIRS}
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}

View File

@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}

View File

@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}

View File

@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${QT_INCLUDE_DIRS} ${QT_INCLUDE_DIRS}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}

View File

@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}

View File

@ -17,8 +17,6 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
find_package(ParaView REQUIRED)
# --- options --- # --- options ---
# additional include directories # additional include directories
@ -51,7 +49,6 @@ SET(_link_LIBRARIES
${KERNEL_SALOMELocalTrace} ${KERNEL_SALOMELocalTrace}
${GUI_SVTK} ${GUI_SVTK}
${QT_QTCORE_LIBRARY} ${QT_QTCORE_LIBRARY}
ParaView::pqApplicationComponents
VTK::RenderingMatplotlib VTK::RenderingMatplotlib
VTK::InteractionStyle VTK::InteractionStyle
VTK::IOLegacy VTK::IOLegacy

View File

@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}

View File

@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}

View File

@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}

View File

@ -24,7 +24,6 @@ INCLUDE(UseQtExt)
# additional include directories # additional include directories
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${PTHREAD_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR}
${OpenCASCADE_INCLUDE_DIR} ${OpenCASCADE_INCLUDE_DIR}
${KERNEL_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS}