Commit f2534cf2 authored by Pierre Guilbert's avatar Pierre Guilbert
Browse files

Merge branch 'kitware-master' into feature/Slam

# Conflicts:
#	Superbuild/CMakeLists.txt
#	Superbuild/Projects/boost.cmake
#	Superbuild/Projects/pcl.cmake
#	Superbuild/Projects/veloview.cmake
#	Superbuild/versions.cmake
#	VelodyneHDL/CMakeLists.txt
#	VelodyneHDL/IO/GPS-IMU/Velodyne/vtkVelodyneHDLPositionReader.cxx
#	VelodyneHDL/IO/Lidar/KITTIDataSet/vtkLidarKITTIDataSetReader.cxx
#	VelodyneHDL/python/veloview/applogic.py
#	vvMainWindow.cxx
#	vvResources.qrc
#	vvToggleSpreadSheetReaction.cxx
parents df083ab4 d0431c29
......@@ -6,13 +6,25 @@ if (APPLE)
message(STATUS "${boost_osx_opts}")
#macosx-version=${CMAKE_OSX_DEPLOYMENT_TARGET} macosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
endif(APPLE)
add_external_project_or_use_system(boost
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND
<SOURCE_DIR>/bootstrap.sh ${boost_toolset} --prefix=<INSTALL_DIR>
--with-libraries=mpi,date_time,thread,regex,system,program_options,filesystem,iostreams,chrono,serialization
BUILD_COMMAND
<SOURCE_DIR>/bjam address-model=${VV_BUILD_ARCHITECTURE} threading=multi
INSTALL_COMMAND
<SOURCE_DIR>/bjam address-model=${VV_BUILD_ARCHITECTURE} threading=multi --prefix=<INSTALL_DIR> install
<SOURCE_DIR>/bootstrap.sh
${boost_toolset}
--prefix=<INSTALL_DIR>
--with-libraries=date_time,thread,regex,system,program_options,filesystem,iostreams,chrono,serialization
BUILD_COMMAND
<SOURCE_DIR>/bjam
address-model=${VV_BUILD_ARCHITECTURE}
threading=multi
--with-regex --with-system --with-date_time --with-program_options --with-iostreams --with-filesystem --with-thread --with-chrono --with-serialization
${boost_osx_opts}
--mmacosx-version-minprefix=<INSTALL_DIR>
install
INSTALL_COMMAND ""
)
......@@ -3,4 +3,6 @@ add_external_project(eigen
${CMAKE_COMMAND} -E copy_if_different
${SuperBuild_PROJECTS_DIR}/patches/eigen.cmake.language_support.cmake
<SOURCE_DIR>/cmake/language_support.cmake
CMAKE_ARGS
-DEIGEN_BUILD_PKGCONFIG=off
)
......@@ -2,6 +2,7 @@ add_external_project(paraview
DEPENDS qt python pythonqt
CMAKE_ARGS
-DCMAKE_CXX_STANDARD=11
-DBUILD_SHARED_LIBS:BOOL=ON
-DBUILD_TESTING:BOOL=OFF
-DPARAVIEW_BUILD_QT_GUI:BOOL=ON
......@@ -29,6 +30,8 @@ add_external_project(paraview
-DPARAVIEW_BUILD_PLUGIN_NonOrthogonalSource:BOOL=FALSE
-DPARAVIEW_BUILD_PLUGIN_PacMan:BOOL=FALSE
-DPARAVIEW_BUILD_PLUGIN_PointSprite:BOOL=FALSE
-DPARAVIEW_BUILD_PLUGIN_PointCloudRepresentation:BOOL=TRUE
-DPARAVIEW_AUTOLOAD_PLUGIN_PointCloudRepresentation:BOOL=TRUE
-DPARAVIEW_BUILD_PLUGIN_PrismPlugin:BOOL=FALSE
-DPARAVIEW_BUILD_PLUGIN_pvblot:BOOL=FALSE
-DPARAVIEW_BUILD_PLUGIN_QuadView:BOOL=FALSE
......@@ -48,6 +51,7 @@ add_external_project(paraview
-DPARAVIEW_CLIENT_RENDER_SERVER_TESTS:BOOL=FALSE
-DPARAVIEW_COLLABORATION_TESTING:BOOL=FALSE
-DVTK_BUILD_QT_DESIGNER_PLUGIN:BOOL=FALSE
-DVTK_RENDERING_BACKEND:STRING=OpenGL2
-DPARAVIEW_BUILD_PLUGIN_PythonQtPlugin:BOOL=TRUE
-DPYTHONQT_DIR:PATH=<INSTALL_DIR>
......
add_external_project(pcl
DEPENDS flann eigen boost png zlib qhull
CMAKE_ARGS
-DCMAKE_CXX_STANDARD=11
-DCMAKE_CXX_STANDARD_REQUIRED=true
......@@ -24,5 +24,5 @@ add_external_project(pcl
-DWITH_PXCAPI:BOOL=OFF
-DWITH_MPI:BOOL=OFF
-DWITH_CUDA:BOOL=OFF
-DWITH_DOCS:BOOL=OFF
)
\ No newline at end of file
-DWITH_DOCS:BOOL=OFF
)
......@@ -29,7 +29,7 @@ elseif (APPLE)
set (patch_command
PATCH_COMMAND /usr/bin/find . -name "*.pro" -exec sed -i -e "s:/Developer/SDKs/:.*:g" {} +)
add_external_project_step(qt-patch-osx
COMMAND git apply --whitespace=fix ${SuperBuild_PROJECTS_DIR}/patches/qt.elcapitan-macossdk.patch
COMMAND patch -p1 < ${SuperBuild_PROJECTS_DIR}/patches/qt.elcapitan-macossdk.patch
WORKING_DIRECTORY <SOURCE_DIR>
DEPENDEES patch
DEPENDERS configure)
......@@ -84,3 +84,16 @@ if ((VV_BUILD_ARCHITECTURE EQUAL 32) AND UNIX AND (NOT APPLE))
DEPENDEES patch
DEPENDERS configure)
endif()
# fix https://bugreports.qt.io/browse/QTBUG-5774 see also the links available there.
# this fix is required when building Qt4 from the Superbuild without having Qt4
# packages installed in you distribution
# this fix does the same things as:
# https://gitlab.kitware.com/paraview/common-superbuild/blob/master/projects/qt4.common.cmake#L5
# this fix requires bash and a CMAKE_MAKE_PROGRAM to be "make"
if (UNIX AND (NOT APPLE))
add_external_project_step(qt-fix-lucene-link
COMMAND bash -c "cd <SOURCE_DIR>/../qt-build && make -j4 install"
DEPENDEES configure
DEPENDERS build)
endif()
......@@ -10,5 +10,5 @@ add_external_project(veloview
-DVTK_DIR:PATH=${SuperBuild_BINARY_DIR}/paraview/src/paraview-build/VTK
-DBOOST_ROOT:PATH=<INSTALL_DIR>
-DBOOST_LIBRARYDIR:PATH=<INSTALL_DIR>/lib
-DPCL_DIR:PATH=<INSTALL_DIR>/share/pcl-1.7/
-DPCL_DIR:PATH=<INSTALL_DIR>/share/pcl-1.8/
)
......@@ -39,7 +39,7 @@ add_revision(pythonqt
set(PARAVIEW_VERSION 5.1)
add_revision(paraview
GIT_REPOSITORY https://gitlab.kitware.com/bjacquet/paraview.git
GIT_TAG origin/veloview)
GIT_TAG origin/point-cloud-rep)
add_revision(veloview
SOURCE_DIR ${CMAKE_SOURCE_DIR}/..
......@@ -55,23 +55,20 @@ else()
URL_MD5 "56e88a5aabdd1e04414985ac24f7e76c")
endif()
# General
add_revision(boost
URL "http://downloads.sourceforge.net/project/boost/boost/1.50.0/boost_1_50_0.tar.gz"
URL_MD5 dbc07ab0254df3dda6300fd737b3f264)
URL "https://sourceforge.net/projects/boost/files/boost/1.63.0/boost_1_63_0.tar.gz"
URL_MD5 7b493c08bc9557bbde7e29091f28b605)
add_revision(eigen
GIT_REPOSITORY https://github.com/eigenteam/eigen-git-mirror.git
GIT_TAG 3.2.0)
add_revision(zlib
URL "http://www.paraview.org/files/dependencies/zlib-1.2.7.tar.gz"
URL_MD5 60df6a37c56e7c1366cca812414f7b85)
# NOTE: if updating zlib version, fix patch in zlib.cmake
add_revision(png
URL "http://paraview.org/files/dependencies/libpng-1.4.8.tar.gz"
URL_MD5 49c6e05be5fa88ed815945d7ca7d4aa9)
add_revision(liblas
GIT_REPOSITORY git://github.com/bastienjacquet/libLAS.git
GIT_TAG fix-windows-stdint)
# CERES specific
add_revision(ceres
GIT_REPOSITORY https://ceres-solver.googlesource.com/ceres-solver
GIT_TAG 1.14.0)
......@@ -80,16 +77,10 @@ add_revision(glog
GIT_REPOSITORY https://github.com/google/glog.git
GIT_TAG 8d7a107d68c127f3f494bb7807b796c8c5a97a82)
# PCL specific
add_revision(pcl
GIT_REPOSITORY git://github.com/gcasey/pcl.git
GIT_TAG 16405ab234889f45ffddfed7ec0701c1bf2ec042)
#add_revision(liblas
# GIT_REPOSITORY git://github.com/libLAS/libLAS
# GIT_TAG 6e8657336ba445fcec3c9e70c2ebcd2e25af40b9)
add_revision(liblas
GIT_REPOSITORY git://github.com/bastienjacquet/libLAS.git
GIT_TAG fix-windows-stdint)
GIT_REPOSITORY git://github.com/PointCloudLibrary/pcl.git
GIT_TAG pcl-1.8.1)
add_revision(qhull
GIT_REPOSITORY git://github.com/qhull/qhull.git
......@@ -97,4 +88,13 @@ add_revision(qhull
add_revision(flann
GIT_REPOSITORY git://github.com/gcasey/flann.git
GIT_TAG 6f6eabaf4e3741f556a12255a0d750b35bf166c0)
\ No newline at end of file
GIT_TAG 6f6eabaf4e3741f556a12255a0d750b35bf166c0)
add_revision(zlib
URL "http://www.paraview.org/files/dependencies/zlib-1.2.7.tar.gz"
URL_MD5 60df6a37c56e7c1366cca812414f7b85)
# NOTE: if updating zlib version, fix patch in zlib.cmake
add_revision(png
URL "http://paraview.org/files/dependencies/libpng-1.4.8.tar.gz"
URL_MD5 49c6e05be5fa88ed815945d7ca7d4aa9)
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