Correct warts in Boost build-up

Author: robertodr

cmake/custom/pcmsolver.cmake

@@ -10,6 +10,7 @@ if(NOT DEFINED SUBMODULES_INSTALL_PREFIX)
 endif()
 
 set(BOOST_MINIMUM_REQUIRED 1.54.0)
+set(BOOST_COMPONENTS_REQUIRED "")
 if(BUILD_STANDALONE OR ENABLE_TIMER)
   set(BOOST_COMPONENTS_REQUIRED "chrono;timer;system")
 endif()

cmake/downloaded/autocmake_boost.cmake

@@ -63,8 +63,8 @@ set(BOOST_ARCHIVE boost_${BOOSTVER}.zip)
 set(Boost_USE_STATIC_LIBS    ON)
 set(Boost_USE_MULTITHREADED  ON)
 set(Boost_USE_STATIC_RUNTIME OFF)
-set(Boost_DEBUG OFF)
-set(Boost_DETAILED_FAILURE_MESSAGE OFF)
+set(Boost_DEBUG ON)
+set(Boost_DETAILED_FAILURE_MESSAGE ON)
 
 set(BUILD_CUSTOM_BOOST FALSE)
 if(FORCE_CUSTOM_BOOST)
@@ -74,6 +74,9 @@ if(FORCE_CUSTOM_BOOST)
     set(BOOST_INCLUDEDIR "")
     set(BOOST_LIBRARYDIR "")
 else()
+    # Read from cache, needed for rebuilds
+    set(BOOST_INCLUDEDIR ${Boost_INCLUDE_DIR})
+    set(BOOST_LIBRARYDIR ${Boost_LIBRARY_DIR})
     find_package(Boost ${BOOST_MINIMUM_REQUIRED} COMPONENTS "${BOOST_COMPONENTS_REQUIRED}")
     if(NOT Boost_FOUND)
         set(BUILD_CUSTOM_BOOST TRUE)

cmake/downloaded/boost_headers.cmake

@@ -1,7 +1,7 @@
 # Install Boost
 add_custom_command(
     OUTPUT ${CUSTOM_BOOST_LOCATION}/boost.installed
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${BOOST_BUILD_DIR}/boost ${CUSTOM_BOOST_LOCATION}/include
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${BOOST_BUILD_DIR}/boost ${CUSTOM_BOOST_LOCATION}/include/boost
     COMMAND ${CMAKE_COMMAND} -E touch ${CUSTOM_BOOST_LOCATION}/boost.installed
     WORKING_DIRECTORY ${BOOST_BUILD_DIR}
     DEPENDS ${CUSTOM_BOOST_LOCATION}/boost.user-config