Support only one boost build subset, regardless of BUILD_GITHUB_PLUGIN.

This is so builders with multiple out of source build trees can all use
the same common boost install directory.  And the build system will not
vascillate between the fuller and lesser subsets of boost.

CMakeModules/download_boost.cmake

@@ -37,11 +37,10 @@ set( BOOST_MD5 15cb8c0803064faef0c4ddf5bc5ca279 )   # re-calc this on every RELE
 set( BOOST_ROOT "${PROJECT_SOURCE_DIR}/boost_root" )
 
 
-if( BUILD_GITHUB_PLUGIN )
-    # Space separated list which indicates the subset of boost libraries to compile.
-    # Chosen libraries are based on AVHTTP requirements, and possibly
-    # unit_test_framework for its own worth.
-    set( BOOST_LIBS_BUILT
+# Space separated list which indicates the subset of boost libraries to compile.
+# Chosen libraries are based on AVHTTP requirements, and possibly
+# unit_test_framework for its own worth.
+set( BOOST_LIBS_BUILT
     #context
     #coroutine
     date_time
@@ -56,7 +55,6 @@ if( BUILD_GITHUB_PLUGIN )
     thread
     #unit_test_framework
     )
-endif()
 
 #-----</configure>---------------------------------------------------------------
 
@@ -85,16 +83,12 @@ function( set_boost_lib_names libs output )
 endfunction()
 
 
-if( BUILD_GITHUB_PLUGIN )
-
-    # It will probably be simpler to make this the only path in the future.
-
-    # (BTW "test" yields "unit_test_framework" when passed to bootstrap.sh ).
-    #message( STATUS "BOOST_LIBS_BUILT:${BOOST_LIBS_BUILT}" )
-    string( REPLACE "unit_test_framework" "test" boost_libs_list "${BOOST_LIBS_BUILT}" )
-    #message( STATUS "REPLACE libs_csv:${boost_libs_list}" )
+# (BTW "test" yields "unit_test_framework" when passed to bootstrap.sh ).
+#message( STATUS "BOOST_LIBS_BUILT:${BOOST_LIBS_BUILT}" )
+string( REPLACE "unit_test_framework" "test" boost_libs_list "${BOOST_LIBS_BUILT}" )
+#message( STATUS "REPLACE libs_csv:${boost_libs_list}" )
 
-    if( MINGW )
+if( MINGW )
     if( MSYS )
         # The Boost system does not build properly on MSYS using bootstrap.sh.  Running
         # bootstrap.bat with cmd.exe does.  It's ugly but it works.  At least for Boost
@@ -108,7 +102,7 @@ if( BUILD_GITHUB_PLUGIN )
         set( b2_libs ${b2_libs} --with-${lib} )
     endforeach()
     unset( PIC_STUFF )
-    else()
+else()
     string( REGEX REPLACE "\\;" "," libs_csv "${boost_libs_list}" )
     #message( STATUS "libs_csv:${libs_csv}" )
 
@@ -117,9 +111,9 @@ if( BUILD_GITHUB_PLUGIN )
     set( PIC_STUFF "cflags=${PIC_FLAG}" )
     set( BOOST_INCLUDE "${BOOST_ROOT}/include" )
     unset( b2_libs )
-    endif()
+endif()
 
-    ExternalProject_Add( boost
+ExternalProject_Add( boost
     PREFIX          "${PREFIX}"
     DOWNLOAD_DIR    "${DOWNLOAD_DIR}"
     INSTALL_DIR     "${BOOST_ROOT}"
@@ -149,7 +143,7 @@ if( BUILD_GITHUB_PLUGIN )
     INSTALL_COMMAND ""
     )
 
-    if( MINGW )
+if( MINGW )
     execute_process( COMMAND ${CMAKE_C_COMPILER} -dumpversion
         OUTPUT_VARIABLE GCC_VERSION
         OUTPUT_STRIP_TRAILING_WHITESPACE )
@@ -170,48 +164,19 @@ if( BUILD_GITHUB_PLUGIN )
     set( BOOST_LIBS_BUILT ${mingw_boost_libs} )
     set( BOOST_INCLUDE "${BOOST_ROOT}/include/boost-${BOOST_LIB_VERSION}" )
     unset( mingw_boost_libs )
-    endif()
-
-    set( boost_libs "" )
-    set_boost_lib_names( "${BOOST_LIBS_BUILT}" boost_libs )
-
-    set( Boost_LIBRARIES    ${boost_libs}      CACHE FILEPATH "Boost libraries directory" )
-    set( Boost_INCLUDE_DIR  "${BOOST_INCLUDE}" CACHE FILEPATH "Boost include directory" )
-
-    mark_as_advanced( Boost_LIBRARIES Boost_INCLUDE_DIR )
-
-    #message( STATUS "BOOST_ROOT:${BOOST_ROOT}  BOOST_LIBRARIES:${BOOST_LIBRARIES}" )
-    #message( STATUS "Boost_INCLUDE_DIR: ${Boost_INCLUDE_DIR}" )
-
-else( BUILD_GITHUB_PLUGIN )
-
-    ExternalProject_Add( boost
-        PREFIX          "${PREFIX}"
-        DOWNLOAD_DIR    "${DOWNLOAD_DIR}"
-        URL             http://downloads.sourceforge.net/project/boost/boost/${BOOST_RELEASE}/boost_${BOOST_VERS}.tar.bz2
-        URL_MD5         ${BOOST_MD5}
-
-        # The patch command executes with the working directory set to <SOURCE_DIR>
-        PATCH_COMMAND   bzr patch -p0 "${PROJECT_SOURCE_DIR}/patches/boost.patch"
-
-        # Dick 18-Aug-2013:
-        # [mis-]use this UPDATE_COMMAND opportunity to remove the old place of boost headers.
-        # Can eventually remove this step after headers are moved from <kicad_src>/include/boost
-        # to <kicad_src>/boost_root/include/boost over the next several months.
-        UPDATE_COMMAND  ${CMAKE_COMMAND} -E remove_directory "${PROJECT_SOURCE_DIR}/include/boost"
+endif()
 
-        CONFIGURE_COMMAND ""
+set( boost_libs "" )
+set_boost_lib_names( "${BOOST_LIBS_BUILT}" boost_libs )
 
-        # remove then re-copy into the include/boost directory during next two steps:
-        BUILD_COMMAND   ${CMAKE_COMMAND} -E remove_directory ${BOOST_ROOT}
-        INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory "${headers_src}" "${BOOST_ROOT}/include/boost"
-        )
+set( Boost_LIBRARIES    ${boost_libs}      CACHE FILEPATH "Boost libraries directory" )
+set( Boost_INCLUDE_DIR  "${BOOST_INCLUDE}" CACHE FILEPATH "Boost include directory" )
 
-    # Until my find_package() support is done for my boost.
-    set( Boost_INCLUDE_DIR  "${BOOST_ROOT}/include" CACHE FILEPATH "Boost include directory" )
+mark_as_advanced( Boost_LIBRARIES Boost_INCLUDE_DIR )
 
+#message( STATUS "BOOST_ROOT:${BOOST_ROOT}  BOOST_LIBRARIES:${BOOST_LIBRARIES}" )
+#message( STATUS "Boost_INCLUDE_DIR: ${Boost_INCLUDE_DIR}" )
 
-endif( BUILD_GITHUB_PLUGIN )
 
 
 ExternalProject_Add_Step( boost bzr_commit_boost