Skip to content

Commit

Permalink
submited opencv patch by ponyma
Browse files Browse the repository at this point in the history
  • Loading branch information
Danny Bickson committed Sep 16, 2014
1 parent 3613ff2 commit e92ab33
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ ExternalProject_Add(opencv
PREFIX ${GraphLab_SOURCE_DIR}/deps/opencv
URL http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/2.4.9/opencv-2.4.9.zip/download
# URL_MD5 010b63a2542c4ec4918c8cb431c00356
# PATCH_COMMAND patch -N -p0 cmake/OpenCVModule.cmake -i ${GraphLab_SOURCE_DIR}/patches/opencv_apple_rpath.patch || true
PATCH_COMMAND patch -N -p0 cmake/OpenCVModule.cmake -i ${GraphLab_SOURCE_DIR}/patches/opencv_apple_rpath.patch || true
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DBUILD_PACKAGE=OFF -DBUILD_EXAMPLES=OFF -DOPENCV_BUILD_3RDPARTY_LIBS=ON -DBUILD_SHARED_LIBS=ON -DBUILD_DOCS=OFF -DBUILD_JPEG=ON -DCMAKE_INCLUDE_PATH=${GraphLab_SOURCE_DIR}/deps/local/include -DWITH_CUBLAS=OFF -DWITH_1394=OFF -DWITH_AVFOUNDATION=OFF -DWITH_CUDA=OFF -DWITH_CUFFT=OFF -DWITH_FFMPEG=OFF -DWITH_GSTREAMER=OFF -DWITH_GTK=OFF -DWITH_QUICKTIME=OFF -DWITH_VIDEOINPUT=OFF -DWITH_XIMEA=OFF -DWITH_XINE=OFF -DWITH_V4L=OFF -DWITH_UNICAP=OFF -DWITH_QT=OFF -DWITH_JASPER=NO -DWITH_TIFF=NO -DWITH_OPENCL=OFF -DCMAKE_LIBRARY_PATH=${GraphLab_SOURCE_DIR}/deps/local/lib
INSTALL_DIR ${GraphLab_SOURCE_DIR}/deps/local)
Expand Down
6 changes: 3 additions & 3 deletions patches/opencv_apple_rpath.patch
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
441a442
564a565
> if(APPLE)
447c448
571c572
< INSTALL_NAME_DIR lib
---
> INSTALL_NAME_DIR "@rpath"
449c450,457
573c574,581
<
---
> else()
Expand Down

0 comments on commit e92ab33

Please sign in to comment.