Commit ba02a170 authored by Bob Obara's avatar Bob Obara Committed by Kitware Robot

Merge topic 'usingParaViewMaster'

1c32e405 ENH: Updating to a pre-5.2 Version of ParaView
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !180
parents fd8ad7a9 1c32e405
......@@ -57,3 +57,8 @@ superbuild_add_project(cmb
-DCMB_SUPERBUILD_DEVELOPER_ROOT:PATH=<INSTALL_DIR>
-DCMAKE_INSTALL_LIBDIR:STRING=${smtk_libdir})
if ((CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "7.0") OR
(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "3.5"))
superbuild_append_flags(cxx_flags "-Wno-inconsistent-missing-override" PROJECT_ONLY)
endif ()
......@@ -69,3 +69,8 @@ endif ()
superbuild_add_extra_cmake_args(
-DSMTK_DIR:PATH=<INSTALL_DIR>/${smtk_cmakedir}/SMTK)
if ((CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "7.0") OR
(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "3.5"))
superbuild_append_flags(cxx_flags "-Wno-inconsistent-missing-override" PROJECT_ONLY)
endif ()
......@@ -3,11 +3,9 @@ superbuild_set_revision(boost
URL_MD5 65a840e1a0b13a558ff19eeb2c4f0cbe)
# XXX: When updating this, update the version number in CMakeLists.txt as well.
# Using ParaView 5.1.2
# Using a Pre ParaView 5.2 version (on master)
#
# Currently using a snapshot of ParaView that is based on 5.1.2 but has no
# version of its own, so I'm leaving the CMakeLists.txt variable as is
set(paraview_revision 602bc96d956767617f133bb63554690bf0cb227c)
set(paraview_revision e27b902f1b7f50ef4b011c208c2e1c7093c897d7)
if (USE_PARAVIEW_master)
set(paraview_revision origin/master)
endif ()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment