Commit 50cdd393 authored by Pierre Guilbert's avatar Pierre Guilbert
Browse files

linux patch for pcl

parent 305976ea
......@@ -123,9 +123,9 @@ set (CM_PROJECTS_ALL)
# Include all optional projects. These are the ones user can pick and choose.
# Some of these allow using system libraries too.
#Plug-in PCL
if (WIN32) # Only available for windows for now
include(pcl)
endif()
#if (WIN32) # Only available for windows for now
include(pcl)
#endif()
# If pcl has been enabled, include flann, zlib, png and qhull
if (pcl_ENABLED)
......@@ -152,4 +152,14 @@ process_dependencies()
if (veloview_ENABLED)
include(veloview.bundle OPTIONAL)
endif()
\ No newline at end of file
endif()
# force boost.mpi to be build and install (needed by pcl)
if (UNIX AND pcl_ENABLED AND boost_ENABLED)
add_custom_command(
TARGET boost
POST_BUILD
COMMAND ${CMAKE_SOURCE_DIR}/Projects/unix/boostMPI.sh
)
endif()
......@@ -10,7 +10,9 @@ add_external_project_or_use_system(boost
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND
<SOURCE_DIR>/bootstrap.sh ${boost_toolset} --prefix=<INSTALL_DIR>
--with-libraries=date_time,thread,regex,system,program_options,filesystem,iostreams,chrono
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 ${boost_osx_opts} --prefix=<INSTALL_DIR> install
INSTALL_COMMAND ""
--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
)
......@@ -2,7 +2,10 @@ add_external_project(pcl
DEPENDS flann eigen boost png zlib qhull
CMAKE_ARGS
-DBOOST_ROOT:FILEPATH=<INSTALL_DIR>/lib
-DCMAKE_CXX_STANDARD=11
-DCMAKE_CXX_STANDARD_REQUIRED=true
-DBOOST_ROOT:PATH=<INSTALL_DIR>
-DBOOST_LIBRARYDIR:PATH=<INSTALL_DIR>/lib
-DBUILD_visualization:BOOL=OFF
-DBUILD_examples:BOOL=OFF
-DBUILD_tools:BOOL=OFF
......@@ -21,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
)
\ No newline at end of file
#!/bin/bash
# run by Superbuild Makefile.txt
echo "Add MPI support"
cd boost/src/boost/
# update configuration file
echo "using mpi ;" >> project-config.jam
# compile library
./b2 -j$(nproc) --target=shared,static
# install library
./b2 install
cd ../../..
echo "MPI support completed"
......@@ -8,4 +8,7 @@ add_external_project(veloview
-DEIGEN_INCLUDE_DIR:PATH=<INSTALL_DIR>/include/eigen3
-DPYTHONQT_DIR:PATH=<INSTALL_DIR>
-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/
)
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