Commit cca547ef authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot

Merge topic 'paraview-dir'

8356c836 cmb: namespace local variables
d52d57bc paraview: set ParaView_DIR and VTK_DIR from paraview.cmake
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard's avatarRobert Maynard <robert.maynard@kitware.com>
Merge-request: !154
parents 82bd643d 8356c836
set(paraview_dir ${CMAKE_CURRENT_BINARY_DIR}/paraview/build)
set(vtk_dir ${paraview_dir}/VTK)
if (__BUILDBOT_INSTALL_LOCATION)
set(paraview_dir <INSTALL_DIR>/lib/cmake/paraview-${paraview_version})
set(vtk_dir <INSTALL_DIR>/lib/cmake/paraview-${paraview_version})
endif ()
set(smtk_libdir lib)
set(cmb_smtk_libdir lib)
if (WIN32)
set(smtk_libdir bin)
set(cmb_smtk_libdir bin)
endif ()
set(cmb_extra_optional_dependencies)
......@@ -30,12 +22,10 @@ superbuild_add_project(cmb
${extra_cmake_args}
-DKML_DIR:PATH=<INSTALL_DIR>
-DGDAL_DIR:PATH=<INSTALL_DIR>
-DParaView_DIR:PATH=${paraview_dir}
-DVTK_DIR:PATH=${vtk_dir}
-DCMB_TEST_DATA_ROOT:PATH=${CMB_TEST_DATA_ROOT}
#specify semi-colon separated paths for session plugins
-DCMB_TEST_PLUGIN_PATHS:STRING=<INSTALL_DIR>/${smtk_libdir}
-DCMB_TEST_PLUGIN_PATHS:STRING=<INSTALL_DIR>/${cmb_smtk_libdir}
#specify what mesh workers we should build
-DBUILD_TRIANGLE_MESH_WORKER:BOOL=${triangle_enabled}
......@@ -56,7 +46,7 @@ superbuild_add_project(cmb
-DCMB_SUPERBUILD_DEVELOPER_ROOT:PATH=<INSTALL_DIR>
-DCMAKE_INSTALL_LIBDIR:STRING=${smtk_libdir})
-DCMAKE_INSTALL_LIBDIR:STRING=${cmb_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"))
......
......@@ -108,3 +108,15 @@ superbuild_add_project(paraview
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=TRUE
${paraview_extra_cmake_args})
if (__BUILDBOT_INSTALL_LOCATION)
set(paraview_paraview_dir <INSTALL_DIR>/lib/cmake/paraview-${paraview_version})
set(paraview_vtk_dir ${paraview_paraview_dir})
else ()
set(paraview_paraview_dir ${CMAKE_CURRENT_BINARY_DIR}/paraview/build)
set(paraview_vtk_dir ${paraview_paraview_dir}/VTK)
endif ()
superbuild_add_extra_cmake_args(
-DParaView_DIR:PATH=${paraview_paraview_dir}
-DVTK_DIR:PATH=${paraview_vtk_dir})
set(paraview_dir ${CMAKE_CURRENT_BINARY_DIR}/paraview/build)
if (__BUILDBOT_INSTALL_LOCATION)
set(paraview_dir <INSTALL_DIR>/lib/cmake/paraview-${paraview_version})
endif ()
set(smtk_extra_cmake_args)
if (WIN32)
# On Windows we expect the Python source for module to be
......@@ -54,7 +48,6 @@ superbuild_add_project(smtk
-DENABLE_NETCDF:BOOL=${netcdf_enabled}
-DNETCDF_ROOT:PATH=<INSTALL_DIR>
-DParaView_DIR:PATH=${paraview_dir}
# GDAL bits to properly enable gdal classes ( mainly wrapper )
# that we need to build
-DGDAL_DIR:PATH=<INSTALL_DIR>
......
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