Fixed bug with default opencv folder name

BloodAxe · Apr 8, 2011 · 375ac48 · 375ac48
1 parent 21b427d
commit 375ac48
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/BuildOpenCV.sh b/BuildOpenCV.sh
@@ -75,11 +75,11 @@ mv $MAC_INSTALL_DIR/include/* $BUILD/include
 # because they prevent building other libs.
 echo "Patching OpenCV sources"
 mkdir -p $PATCHED_SRC_DIR
-cp -R $SRC $PATCHED_SRC_DIR
-sed '/add_subdirectory(ts)/d' $PATCHED_SRC_DIR/opencv/modules/CMakeLists.txt      > $PATCHED_SRC_DIR/opencv/modules/CMakeLists.txt.patched
-mv $PATCHED_SRC_DIR/opencv/modules/CMakeLists.txt.patched                           $PATCHED_SRC_DIR/opencv/modules/CMakeLists.txt
-sed '/add_subdirectory(highgui)/d' $PATCHED_SRC_DIR/opencv/modules/CMakeLists.txt > $PATCHED_SRC_DIR/opencv/modules/CMakeLists.txt.patched
-mv $PATCHED_SRC_DIR/opencv/modules/CMakeLists.txt.patched                           $PATCHED_SRC_DIR/opencv/modules/CMakeLists.txt
+cp -R $SRC/ $PATCHED_SRC_DIR
+sed '/add_subdirectory(ts)/d' $PATCHED_SRC_DIR/modules/CMakeLists.txt      > $PATCHED_SRC_DIR/modules/CMakeLists.txt.patched
+mv $PATCHED_SRC_DIR/modules/CMakeLists.txt.patched                           $PATCHED_SRC_DIR/modules/CMakeLists.txt
+sed '/add_subdirectory(highgui)/d' $PATCHED_SRC_DIR/modules/CMakeLists.txt > $PATCHED_SRC_DIR/modules/CMakeLists.txt.patched
+mv $PATCHED_SRC_DIR/modules/CMakeLists.txt.patched                           $PATCHED_SRC_DIR/modules/CMakeLists.txt
 
 ################################################################################
 # Configure OpenCV
@@ -99,7 +99,7 @@ cmake -DCMAKE_INSTALL_PREFIX=$IOS_INSTALL_DIR \
 -DWITH_QT=NO \
 -DWITH_QUICKTIME=NO \
 -DOPENCV_BUILD_3RDPARTY_LIBS=YES \
--G Xcode $PATCHED_SRC_DIR/opencv > /dev/null
+-G Xcode $PATCHED_SRC_DIR > /dev/null
 
 ################################################################################
 # Build for device armv6 architecture :

diff --git a/README b/README
@@ -10,8 +10,14 @@
 
 Changelog:
 
+Version 1.3
++ Fixed bug with creation of universal binaries if opencv source path was not ends with 'opencv'
+
+Version 1.2
++ Added Armv6 architecture support
+
 Version 1.1 - Added support for XCode 4
 + Fixed problem when building for XCode 4 - resolved by patching copy of OpenCV sources
 
 Version 1.0 - Initial commit
-+ Supported OpenCV up to 4771 revision, XCode 3 and iOS SDK 4.2.1
++ Supported OpenCV up to 4771 revision, XCode 3 and iOS SDK 4.2.1