Skip to content

Commit

Permalink
download using wget rather than URL to avoid curl ssl dependency. tem…
Browse files Browse the repository at this point in the history 
…porary fix for not finding eigen3 using default caffe Makefiles
  • Loading branch information
Victor Vedovato committed Mar 14, 2017
1 parent f60f8e9 commit ad70830
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ else()
caffe_dd
PREFIX caffe_dd
INSTALL_DIR ${CMAKE_BINARY_DIR}
URL https://github.com/beniz/caffe/archive/master.tar.gz
CONFIGURE_COMMAND ln -sf Makefile.config.gpu.cudnn Makefile.config && echo "OPENCV_VERSION:=${OPENCV_VERSION}" >> Makefile.config && ${CMAKE_COMMAND} -E env PATH=${CMAKE_BINARY_DIR}/protobuf/bin:$ENV{PATH} make CUDA_ARCH=${CUDA_ARCH} -j${N}
DOWNLOAD_COMMAND wget https://github.com/beniz/caffe/archive/master.tar.gz && tar xfz master.tar.gz --strip-components=1 -C caffe_dd
CONFIGURE_COMMAND ln -sf Makefile.config.gpu.cudnn Makefile.config && echo -e "OPENCV_VERSION:=${OPENCV_VERSION}\\nCUSTOM_CXX := g++-4.9\\nINCLUDE_DIRS += /usr/include:${INCLUDE_DIRS}" >> Makefile.config && ${CMAKE_COMMAND} -E env PATH=${CMAKE_BINARY_DIR}/protobuf/bin:$ENV{PATH} make CUDA_ARCH=${CUDA_ARCH} -j${N}
INSTALL_COMMAND ""
BUILD_IN_SOURCE 1
)
Expand All @@ -141,8 +141,8 @@ else()
caffe_dd
PREFIX caffe_dd
INSTALL_DIR ${CMAKE_BINARY_DIR}
URL https://github.com/beniz/caffe/archive/master.tar.gz
CONFIGURE_COMMAND ln -sf Makefile.config.gpu.cudnn Makefile.config && echo "OPENCV_VERSION:=${OPENCV_VERSION}" >> Makefile.config && make CUDA_ARCH=${CUDA_ARCH} -j${N}
DOWNLOAD_COMMAND wget https://github.com/beniz/caffe/archive/master.tar.gz && tar xfz master.tar.gz --strip-components=1 -C caffe_dd
CONFIGURE_COMMAND ln -sf Makefile.config.gpu.cudnn Makefile.config && echo -e "OPENCV_VERSION:=${OPENCV_VERSION}\\nCUSTOM_CXX := g++-4.9\\nINCLUDE_DIRS += /usr/include:${INCLUDE_DIRS}" >> Makefile.config && make CUDA_ARCH=${CUDA_ARCH} -j${N}
INSTALL_COMMAND ""
BUILD_IN_SOURCE 1
)
Expand All @@ -153,8 +153,8 @@ else()
caffe_dd
PREFIX caffe_dd
INSTALL_DIR ${CMAKE_BINARY_DIR}
URL https://github.com/beniz/caffe/archive/master.tar.gz
CONFIGURE_COMMAND ln -sf Makefile.config.gpu Makefile.config && echo "OPENCV_VERSION:=${OPENCV_VERSION}" >> Makefile.config && ${CMAKE_COMMAND} -E env PATH=${CMAKE_BINARY_DIR}/protobuf/bin:$ENV{PATH} make -j${N}
DOWNLOAD_COMMAND wget https://github.com/beniz/caffe/archive/master.tar.gz && tar xfz master.tar.gz --strip-components=1 -C caffe_dd
CONFIGURE_COMMAND ln -sf Makefile.config.gpu Makefile.config && echo -e "OPENCV_VERSION:=${OPENCV_VERSION}\\nCUSTOM_CXX := g++-4.9\\nINCLUDE_DIRS += /usr/include:${INCLUDE_DIRS}" >> Makefile.config && ${CMAKE_COMMAND} -E env PATH=${CMAKE_BINARY_DIR}/protobuf/bin:$ENV{PATH} make -j${N}
INSTALL_COMMAND ""
BUILD_IN_SOURCE 1
)
Expand All @@ -163,8 +163,8 @@ else()
caffe_dd
PREFIX caffe_dd
INSTALL_DIR ${CMAKE_BINARY_DIR}
URL https://github.com/beniz/caffe/archive/master.tar.gz
CONFIGURE_COMMAND ln -sf Makefile.config.gpu Makefile.config && echo "OPENCV_VERSION:=${OPENCV_VERSION}" >> Makefile.config && make -j${N}
DOWNLOAD_COMMAND wget https://github.com/beniz/caffe/archive/master.tar.gz && tar xfz master.tar.gz --strip-components=1 -C caffe_dd
CONFIGURE_COMMAND ln -sf Makefile.config.gpu Makefile.config && echo -e "OPENCV_VERSION:=${OPENCV_VERSION}\\nCUSTOM_CXX := g++-4.9\\nINCLUDE_DIRS += /usr/include:${INCLUDE_DIRS}" >> Makefile.config && make -j${N}
INSTALL_COMMAND ""
BUILD_IN_SOURCE 1
)
Expand All @@ -176,8 +176,8 @@ else()
caffe_dd
PREFIX caffe_dd
INSTALL_DIR ${CMAKE_BINARY_DIR}
URL https://github.com/beniz/caffe/archive/master.tar.gz
CONFIGURE_COMMAND ln -sf Makefile.config.cpu Makefile.config && echo "OPENCV_VERSION:=${OPENCV_VERSION}" >> Makefile.config && ${CMAKE_COMMAND} -E env PATH=${CMAKE_BINARY_DIR}/protobuf/bin:$ENV{PATH} make -j${N}
DOWNLOAD_COMMAND wget https://github.com/beniz/caffe/archive/master.tar.gz && tar xfz master.tar.gz --strip-components=1 -C caffe_dd
CONFIGURE_COMMAND ln -sf Makefile.config.cpu Makefile.config && echo -e "OPENCV_VERSION:=${OPENCV_VERSION}\\nCUSTOM_CXX := g++-4.9\\nINCLUDE_DIRS += /usr/include:${INCLUDE_DIRS}" >> Makefile.config && ${CMAKE_COMMAND} -E env PATH=${CMAKE_BINARY_DIR}/protobuf/bin:$ENV{PATH} make -j${N}
INSTALL_COMMAND ""
BUILD_IN_SOURCE 1
)
Expand All @@ -186,8 +186,8 @@ else()
caffe_dd
PREFIX caffe_dd
INSTALL_DIR ${CMAKE_BINARY_DIR}
URL https://github.com/beniz/caffe/archive/master.tar.gz
CONFIGURE_COMMAND ln -sf Makefile.config.cpu Makefile.config && echo "OPENCV_VERSION:=${OPENCV_VERSION}" >> Makefile.config && make -j${N}
DOWNLOAD_COMMAND wget https://github.com/beniz/caffe/archive/master.tar.gz && tar xfz master.tar.gz --strip-components=1 -C caffe_dd
CONFIGURE_COMMAND ln -sf Makefile.config.cpu Makefile.config && echo -e "OPENCV_VERSION:=${OPENCV_VERSION}\\nCUSTOM_CXX := g++-4.9\\nINCLUDE_DIRS += /usr/include:${INCLUDE_DIRS}" >> Makefile.config && make -j${N}
INSTALL_COMMAND ""
BUILD_IN_SOURCE 1
)
Expand Down

0 comments on commit ad70830

Please sign in to comment.