Commit ea8ddce8 authored by Rashad Kanavath's avatar Rashad Kanavath
Browse files

SuperBuild: boost: 1.50 -> 1.57.0 (might be the reason for massive dl_close error)

This commit also make some changes in opencv config and download url. Both are
put together because it will be easy to revert/cherry-pick based on
tomorrow's dashboard results
parent c41abd87
...@@ -10,8 +10,8 @@ if(MSVC) ...@@ -10,8 +10,8 @@ if(MSVC)
set(BOOST_URL "http://download.sourceforge.net/project/boost/boost/1.60.0/boost_1_60_0.tar.bz2") set(BOOST_URL "http://download.sourceforge.net/project/boost/boost/1.60.0/boost_1_60_0.tar.bz2")
set(BOOST_URL_MD5 "65a840e1a0b13a558ff19eeb2c4f0cbe") set(BOOST_URL_MD5 "65a840e1a0b13a558ff19eeb2c4f0cbe")
else() else()
set(BOOST_URL "http://download.sourceforge.net/project/boost/boost/1.50.0/boost_1_50_0.tar.bz2") set(BOOST_URL "http://download.sourceforge.net/project/boost/boost/1.57.0/boost_1_57_0.tar.bz2")
set(BOOST_URL_MD5 "52dd00be775e689f55a987baebccc462") set(BOOST_URL_MD5 "1be49befbdd9a5ce9def2983ba3e7b76")
endif() endif()
ExternalProject_Add(BOOST ExternalProject_Add(BOOST
......
...@@ -14,7 +14,7 @@ ADD_SUPERBUILD_CMAKE_VAR(OPENCV PNG_LIBRARY) ...@@ -14,7 +14,7 @@ ADD_SUPERBUILD_CMAKE_VAR(OPENCV PNG_LIBRARY)
ExternalProject_Add(OPENCV ExternalProject_Add(OPENCV
PREFIX OPENCV PREFIX OPENCV
URL "http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/2.4.11/opencv-2.4.11.zip/download" URL "http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/2.4.11/opencv-2.4.11.zip"
URL_MD5 32f498451bff1817a60e1aabc2939575 URL_MD5 32f498451bff1817a60e1aabc2939575
BINARY_DIR ${OPENCV_SB_BUILD_DIR} BINARY_DIR ${OPENCV_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX} INSTALL_DIR ${SB_INSTALL_PREFIX}
...@@ -30,7 +30,7 @@ ExternalProject_Add(OPENCV ...@@ -30,7 +30,7 @@ ExternalProject_Add(OPENCV
-DWITH_FFMPEG:BOOL=OFF -DWITH_FFMPEG:BOOL=OFF
-DWITH_VFW:BOOL=OFF -DWITH_VFW:BOOL=OFF
-DBUILD_OPENEXR:BOOL=OFF -DBUILD_OPENEXR:BOOL=OFF
-DBUILD_PACKAGE:BOOL=ON -DBUILD_PACKAGE:BOOL=OFF
-DBUILD_PERF_TESTS:BOOL=OFF -DBUILD_PERF_TESTS:BOOL=OFF
-DBUILD_PNG:BOOL=OFF -DBUILD_PNG:BOOL=OFF
-DBUILD_TBB:BOOL=OFF -DBUILD_TBB:BOOL=OFF
...@@ -60,8 +60,24 @@ ExternalProject_Add(OPENCV ...@@ -60,8 +60,24 @@ ExternalProject_Add(OPENCV
-DBUILD_opencv_video:BOOL=OFF -DBUILD_opencv_video:BOOL=OFF
-DBUILD_opencv_videostab:BOOL=OFF -DBUILD_opencv_videostab:BOOL=OFF
-DBUILD_opencv_world:BOOL=OFF -DBUILD_opencv_world:BOOL=OFF
-DBUILD_WITH_DEBUG_INFO:BOOL=OFF
-DWITH_CUDA:BOOL=OFF -DWITH_CUDA:BOOL=OFF
-DWITH_OPENCL:BOOL=OFF -DWITH_OPENCL:BOOL=OFF
-DWITH_CUFFT:BOOL=OFF
-DWITH_GIGEAPI:BOOL=OFF
-DWITH_GSTREAMER:BOOL=OFF
-DWITH_GTK:BOOL=OFF
-DWITH_OPENCLAMDBLAS:BOOL=OFF
-DWITH_OPENCLAMDFFT:BOOL=OFF
-DWITH_OPENEXR:BOOL=OFF
-DWITH_PVAPI:BOOL=OFF
-DWITH_QT=OFF
-DWITH_UNICAP:BOOL=OFF
-DWITH_LIBV4L:BOOL=OFF
-DWITH_V4L:BOOL=OFF
-DWITH_VTK:BOOL=OFF
-DWITH_XIMEA:BOOL=OFF
-DWITH_XINE:BOOL=OFF
${OPENCV_SB_CONFIG} ${OPENCV_SB_CONFIG}
DEPENDS ${OPENCV_DEPENDENCIES} DEPENDS ${OPENCV_DEPENDENCIES}
CMAKE_COMMAND ${SB_CMAKE_COMMAND} CMAKE_COMMAND ${SB_CMAKE_COMMAND}
......
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