Merge pull request #5617 from lukeyeager/boost-1.54

Downgrade boost requirement from 1.55 to 1.54
BVLC · 25391bf9e0552740af8253c6d6fd484297889a49 · shelhamer committed on GitHub May 12, 2017 · May 12, 2017 · 25391bf
2 parents 7d3f8a7 + b7e2b99
commit 25391bf9e0552740af8253c6d6fd484297889a49
Unified Split

Showing with 5 additions and 5 deletions.

+1 −1 cmake/Dependencies.cmake

+4 −4 scripts/travis/install-deps.sh
diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
@@ -5,7 +5,7 @@ set(Caffe_DEFINITIONS "")
 set(Caffe_COMPILE_OPTIONS "")
 
 # ---[ Boost
-find_package(Boost 1.55 REQUIRED COMPONENTS system thread filesystem)
+find_package(Boost 1.54 REQUIRED COMPONENTS system thread filesystem)
 list(APPEND Caffe_INCLUDE_DIRS PUBLIC ${Boost_INCLUDE_DIRS})
 list(APPEND Caffe_LINKER_LIBS PUBLIC ${Boost_LIBRARIES})
 
diff --git a/scripts/travis/install-deps.sh b/scripts/travis/install-deps.sh
@@ -9,10 +9,10 @@ apt-get -y update
 apt-get install -y --no-install-recommends \
   build-essential \
   graphviz \
-  libboost-filesystem1.55-dev \
-  libboost-python1.55-dev \
-  libboost-system1.55-dev \
-  libboost-thread1.55-dev \
+  libboost-filesystem-dev \
+  libboost-python-dev \
+  libboost-system-dev \
+  libboost-thread-dev \
   libgflags-dev \
   libgoogle-glog-dev \
   libhdf5-serial-dev \