Commit 36e60e01 authored by Nicolas Cadart's avatar Nicolas Cadart
Browse files

Minor superbuild sub-projects CMake configuration fixes

- Build Ceres with CXX11 support as C++11 standard is already used
- Build Ceres and Glog as shared libs (used multiple times)
- Use official Glog version tag (v0.4.0) instead of commit as the release is now available
- Remove Eigen and Flann tests building
- Fix CMake variables names
- Set PCL C++ standard to 14 as requested in doc.
parent b1a3dc90
......@@ -4,6 +4,8 @@ superbuild_add_project(ceres
CMAKE_ARGS
-DCMAKE_CXX_STANDARD=11
-DCMAKE_CXX_STANDARD_REQUIRED=ON
-DCXX11=ON
-DBUILD_SHARED_LIBS=ON
-DBUILD_TESTING=OFF
-DBUILD_EXAMPLES=OFF
-DGFLAGS=OFF
......
......@@ -5,4 +5,5 @@ superbuild_add_project(eigen
<SOURCE_DIR>/cmake/language_support.cmake
CMAKE_ARGS
-DEIGEN_BUILD_PKGCONFIG=OFF
-DBUILD_TESTING=OFF
)
superbuild_add_project(flann
CMAKE_ARGS
-DBUILD_EXAMPLES:BOOL=OFF
-DBUILD_TESTS:BOOL=OFF
-DBUILD_DOC:BOOL=OFF
-DBUILD_PYTHON_BINDINGS:BOOL=OFF
-DBUILD_MATLAB_BINDINGS:BOOL=OFF
)
superbuild_add_project(glog
CMAKE_ARGS
-DBUILD_SHARED_LIBS=ON
-DBUILD_TESTING=OFF
-DWITH_GFLAGS=OFF
)
......@@ -4,5 +4,5 @@ superbuild_add_project(nanoflann
CMAKE_ARGS
-DBUILD_EXAMPLES=OFF
-DBUILD_TESTS=OFF
-DEIGEN3_DIR=<INSTALL_DIR>/include/eigen3
-DEIGEN3_INCLUDE=<INSTALL_DIR>/include/eigen3
)
......@@ -2,7 +2,7 @@ superbuild_add_project(pcl
DEPENDS flann eigen boost png zlib qhull
CMAKE_ARGS
-DCMAKE_CXX_STANDARD=11
-DCMAKE_CXX_STANDARD=14
-DCMAKE_CXX_STANDARD_REQUIRED:BOOL=ON
-DBoost_NO_BOOST_CMAKE:BOOL=ON
-DBoost_USE_MULTITHREAD:BOOL=ON
......
......@@ -50,7 +50,7 @@ superbuild_set_revision(ceres
superbuild_set_revision(glog
GIT_REPOSITORY https://github.com/google/glog.git
GIT_TAG 8d7a107d68c127f3f494bb7807b796c8c5a97a82)
GIT_TAG v0.4.0)
superbuild_set_revision(pcl
GIT_REPOSITORY https://github.com/PointCloudLibrary/pcl.git
......
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