diff --git a/SuperBuild/CMake/External_boost.cmake b/SuperBuild/CMake/External_boost.cmake
index 928e78e5077ed8afaaaf0579f176d82b727fff77..f451b94ef1dc667aad8d7cb52a3f1636e2c17e61 100644
--- a/SuperBuild/CMake/External_boost.cmake
+++ b/SuperBuild/CMake/External_boost.cmake
@@ -1,125 +1,31 @@
-# Use boost 1.54. There was previously incompatibilities between boost and Qt which leads
-# to compilation errors for OTB. We could increase boost version to last stable
-# release in future version of superbuild as we've patchedOTB code to
-# support both libraries. See the related changeset in OTB trunk:
-# http://hg.orfeo-toolbox.org/OTB/r# ev/8da67e36c78d
-
INCLUDE_ONCE_MACRO(BOOST)
-
+
SETUP_SUPERBUILD(BOOST)
-option(SUPERBUILD_BOOST_HEADER_ONLY "Only use Boost headers" ON)
-mark_as_advanced(SUPERBUILD_BOOST_HEADER_ONLY)
-
-if(UNIX)
- if(SUPERBUILD_BOOST_HEADER_ONLY)
- ExternalProject_Add(BOOST
- PREFIX BOOST
- URL "http://sourceforge.net/projects/boost/files/boost/1.50.0/boost_1_50_0.tar.bz2/download"
- URL_MD5 52dd00be775e689f55a987baebccc462
- BINARY_DIR ${BOOST_SB_BUILD_DIR}
- INSTALL_DIR ${SB_INSTALL_PREFIX}
- DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
- CMAKE_CACHE_ARGS ${SB_CMAKE_CACHE_ARGS}
- PATCH_COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_SOURCE_DIR}/patches/BOOST/CMakeLists.txt
- ${BOOST_SB_SRC}
- )
- else()
- ExternalProject_Add(BOOST
- PREFIX BOOST
- URL "http://sourceforge.net/projects/boost/files/boost/1.50.0/boost_1_50_0.tar.bz2/download"
- URL_MD5 52dd00be775e689f55a987baebccc462
- BINARY_DIR ${BOOST_SB_BUILD_DIR}
- INSTALL_DIR ${SB_INSTALL_PREFIX}
- DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
- CONFIGURE_COMMAND
- ${BOOST_SB_BUILD_DIR}/bootstrap.sh
- --prefix=${SB_INSTALL_PREFIX}
- --with-libraries=graph,test,regex
- BUILD_COMMAND ./b2
- INSTALL_COMMAND ./b2 install
- PATCH_COMMAND ${CMAKE_COMMAND} -E copy_directory
- ${CMAKE_SOURCE_DIR}/patches/BOOST/1.54.0
- ${BOOST_SB_SRC}
- )
-
- ExternalProject_Add_Step(BOOST copy_source
- COMMAND ${CMAKE_COMMAND} -E copy_directory
- ${BOOST_SB_SRC} ${BOOST_SB_BUILD_DIR}
- DEPENDEES patch update
- DEPENDERS configure
- )
- endif()
-
-
- elseif(MSVC10)
-
- #TODO: find hash for archives properly
- set(BOOST_HEADERS_URL_HASH 1605dc6085cb2dc778ef5ab6c0e59083)
- set(BOOST_GRAPH_URL_HASH c246516ca84a3c79ae8a0b22fceb0344)
- set(BOOST_REGEX_URL_HASH a3bfc2dc9a3ebe3c050518ecb29d6f8b)
- set(BOOST_UTF_URL_HASH 75971963a74c76d32e01974a8e48be11)
+#all we loose is one single test from not building boost unit-testing-framework.
+#That is single test code. I don't see why we can't use something in-house
+#change test code to not use boost unit-testing-framework and all is well.
+
+if(MSVC)
+ set(BOOST_URL "http://download.sourceforge.net/project/boost/boost/1.60.0/boost_1_60_0.tar.bz2")
+ set(BOOST_URL_MD5 "65a840e1a0b13a558ff19eeb2c4f0cbe")
+else()
+ set(BOOST_URL "http://download.sourceforge.net/project/boost/boost/1.50.0/boost_1_50_0.tar.bz2")
+ set(BOOST_URL_MD5 "52dd00be775e689f55a987baebccc462")
+endif()
- set(BOOST_HEADERS_URL "http://sourceforge.net/projects/boost/files/boost-binaries/1.50.0/boost_1_50_headers.zip/download")
- set(BOOST_GRAPH_URL "http://sourceforge.net/projects/boost/files/boost-binaries/1.50.0/libboost_graph-vc100-mt-1_50.zip/download")
- set(BOOST_UTF_URL "http://sourceforge.net/projects/boost/files/boost-binaries/1.50.0/boost_unit_test_framework-vc100-mt-1_50.zip/download")
- set(BOOST_REGEX_URL "http://sourceforge.net/projects/boost/files/boost-binaries/1.50.0/libboost_regex-vc100-mt-1_50.zip/download")
+ExternalProject_Add(BOOST
+ PREFIX BOOST
+ URL "${BOOST_URL}"
+ URL_MD5 ${BOOST_URL_MD5}
+ BINARY_DIR ${BOOST_SB_BUILD_DIR}
+ INSTALL_DIR ${SB_INSTALL_PREFIX}
+ DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
+ CMAKE_CACHE_ARGS ${SB_CMAKE_CACHE_ARGS}
+ PATCH_COMMAND ${CMAKE_COMMAND} -E copy
+ ${CMAKE_SOURCE_DIR}/patches/BOOST/CMakeLists.txt
+ ${BOOST_SB_SRC}
+ )
- ExternalProject_Add(BOOST_HEADERS
- PREFIX BOOST/_HEADERS
- URL ${BOOST_HEADERS_URL}
- URL_MD5 ${BOOST_HEADERS_URL_HASH}
- SOURCE_DIR ${BOOST_SB_SRC}/include/boost
- CONFIGURE_COMMAND ""
- BUILD_COMMAND ""
- INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory ${BOOST_SB_SRC}/include/ ${SB_INSTALL_PREFIX}/include/
- )
- set(BOOSTLIBS)
- foreach(BOOSTLIB "REGEX" "GRAPH" "UTF")
- ExternalProject_Add(BOOST_${BOOSTLIB}
- PREFIX BOOST/_${BOOSTLIB}
- URL ${BOOST_${BOOSTLIB}_URL}
- URL_MD5 ${BOOST_${BOOSTLIB}_URL_HASH}
- SOURCE_DIR ${BOOST_SB_SRC}/lib
- DEPENDS BOOST_HEADERS
- CONFIGURE_COMMAND ""
- BUILD_COMMAND ""
- INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory ${BOOST_SB_SRC}/lib ${SB_INSTALL_PREFIX}/lib
- )
- list(APPEND BOOSTLIBS BOOST_${BOOSTLIB})
- endforeach()
-
- ExternalProject_Add(BOOST
- PREFIX BOOST
- DOWNLOAD_COMMAND ""
- SOURCE_DIR ${BOOST_SB_SRC}
- DEPENDS ${BOOSTLIBS}
- CONFIGURE_COMMAND ""
- BUILD_COMMAND ""
- INSTALL_COMMAND ""
- )
- message(STATUS " Using Boost SuperBuild version (prebuilt binaries)")
-
-elseif(MSVC14)
- if(SUPERBUILD_BOOST_HEADER_ONLY)
- ExternalProject_Add(BOOST
- PREFIX BOOST
- URL "http://sourceforge.net/projects/boost/files/boost/1.60.0/boost_1_60_0.tar.bz2/download"
- URL_MD5 65a840e1a0b13a558ff19eeb2c4f0cbe
- BINARY_DIR ${BOOST_SB_BUILD_DIR}
- INSTALL_DIR ${SB_INSTALL_PREFIX}
- DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
- CMAKE_CACHE_ARGS ${SB_CMAKE_CACHE_ARGS}
- PATCH_COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_SOURCE_DIR}/patches/BOOST/CMakeLists.txt
- ${BOOST_SB_SRC}
- )
- else()
- message(FATAL_ERROR "not build yet")
- endif()
-endif() #end else MSVC
-
set(_SB_Boost_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)
set(_SB_Boost_LIBRARY_DIR ${SB_INSTALL_PREFIX}/lib)
-
\ No newline at end of file