Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use OpenCV 2.4 (Fixes #336) #339

Merged
merged 1 commit into from
Dec 30, 2017
Merged

Use OpenCV 2.4 (Fixes #336) #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/macos/build-macos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ cd $PSMOVEAPI_CHECKOUT
if [ ! -d $OPENCV_INSTALL_DIR ]; then
cd external
if [ ! -d opencv ]; then
git clone --depth 1 --branch 3.1.0 git://github.com/Itseez/opencv.git
git clone --depth 1 --branch 2.4 git://github.com/opencv/opencv.git
fi
cd opencv

Expand Down
4 changes: 2 additions & 2 deletions scripts/mingw64/cross-compile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ fi
PSMOVEAPI_PLATFORM="$1"
shift

OPENCV_VERSION=3.1.0
OPENCV_VERSION=2.4
PSMOVEAPI_VERSION=$(git describe --tags)

MAKE_ARGS="$@"
Expand All @@ -35,7 +35,7 @@ fi
# Build OpenCV
if [ ! -d external/opencv ]; then
if [ ! -f ${OPENCV_VERSION}.zip ]; then
curl -O -L https://github.com/Itseez/opencv/archive/${OPENCV_VERSION}.zip
curl -O -L https://github.com/opencv/opencv/archive/${OPENCV_VERSION}.zip
fi
unzip ${OPENCV_VERSION}.zip
mv opencv-${OPENCV_VERSION} external/opencv
Expand Down
2 changes: 1 addition & 1 deletion scripts/visualc/build_msvc.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ IF !ERRORLEVEL! NEQ 0 (
REM Clone OpenCV
IF NOT EXIST %OPENCV_DIR% (
cd %PSMOVE_API_EXTERNAL_DIR%
git clone --depth 1 --branch 3.1.0 git://github.com/Itseez/opencv.git
git clone --depth 1 --branch 2.4 git://github.com/opencv/opencv.git
) ELSE (
echo.
echo OpenCV dir already exists; assuming it has been cloned already
Expand Down