Commit 4a99c6b0 authored by Nicolas Cadart's avatar Nicolas Cadart
Browse files

Merge branch 'fix/CheckSystemBoostEnvVar' into 'master'

Check system boost environment variables and clean boost related CMake variables

See merge request !18
parents 8e2a3656 7b70763c
...@@ -203,6 +203,13 @@ set(boost_libraries ...@@ -203,6 +203,13 @@ set(boost_libraries
set(boost_extra_options set(boost_extra_options
"-sNO_BZIP2=1") "-sNO_BZIP2=1")
# Check if some Boost environment variables could hide local Boost install
if (NOT ${USE_SYSTEM_boost} AND (DEFINED ENV{BOOSTROOT} OR DEFINED ENV{BOOST_ROOT} OR DEFINED ENV{BOOST_LIBRARYDIR} OR DEFINED ENV{BOOST_INCLUDEDIR}))
message(WARNING "Some Boost environment variables are set and may hide the local superbuild Boost installation. "
"Consider enabling USE_SYSTEM_boost flag or unsetting the following environement variables :\n"
" BOOSTROOT=$ENV{BOOSTROOT}\n BOOST_ROOT=$ENV{BOOST_ROOT}\n BOOST_LIBRARYDIR=$ENV{BOOST_LIBRARYDIR}\n BOOST_INCLUDEDIR=$ENV{BOOST_INCLUDEDIR}")
endif()
list(APPEND superbuild_version_files list(APPEND superbuild_version_files
"${CMAKE_CURRENT_LIST_DIR}/versions.cmake") "${CMAKE_CURRENT_LIST_DIR}/versions.cmake")
list(APPEND superbuild_project_roots list(APPEND superbuild_project_roots
......
...@@ -8,11 +8,8 @@ superbuild_add_project(pcl ...@@ -8,11 +8,8 @@ superbuild_add_project(pcl
-DBoost_NO_BOOST_CMAKE:BOOL=ON -DBoost_NO_BOOST_CMAKE:BOOL=ON
-DBoost_USE_MULTITHREAD:BOOL=ON -DBoost_USE_MULTITHREAD:BOOL=ON
-DBoost_USE_STATIC_LIBS:BOOL=OFF -DBoost_USE_STATIC_LIBS:BOOL=OFF
-DBoost_USE_STATIC:BOOL=OFF
-DPCL_BUILD_WITH_BOOST_DYNAMIC_LINKING_WIN32:BOOL=ON -DPCL_BUILD_WITH_BOOST_DYNAMIC_LINKING_WIN32:BOOL=ON
-DBOOST_LIBRARYDIR:PATH=<INSTALL_DIR>/lib -DBOOST_LIBRARYDIR:PATH=<INSTALL_DIR>/lib
-DBoost_LIBRARY_DIR_DEBUG:PATH=<INSTALL_DIR>/lib
-DBoost_LIBRARY_DIR_RELEASE:PATH=<INSTALL_DIR>/lib
-DEIGEN_INCLUDE_DIR=<INSTALL_DIR>/include/eigen3 -DEIGEN_INCLUDE_DIR=<INSTALL_DIR>/include/eigen3
-DQHULL_LIBRARY:FILEPATH=<INSTALL_DIR>/lib/${CMAKE_STATIC_LIBRARY_PREFIX}qhullstatic${CMAKE_STATIC_LIBRARY_SUFFIX} -DQHULL_LIBRARY:FILEPATH=<INSTALL_DIR>/lib/${CMAKE_STATIC_LIBRARY_PREFIX}qhullstatic${CMAKE_STATIC_LIBRARY_SUFFIX}
-DQHULL_LIBRARY_DEBUG:FILEPATH=<INSTALL_DIR>/lib/${CMAKE_STATIC_LIBRARY_PREFIX}qhullstatic${CMAKE_STATIC_LIBRARY_SUFFIX} -DQHULL_LIBRARY_DEBUG:FILEPATH=<INSTALL_DIR>/lib/${CMAKE_STATIC_LIBRARY_PREFIX}qhullstatic${CMAKE_STATIC_LIBRARY_SUFFIX}
......
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