Skip to content

Commit 50f6642

Browse files
committed
* Formatted code, removed debugging command.
1 parent 42b763d commit 50f6642

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

recipes/opencv/recipe.sh

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,21 @@ function shouldbuild_opencv() {
3131

3232
function build_opencv() {
3333

34-
try mkdir -p $_cvbuild
35-
cd $_cvbuild
34+
try mkdir -p $_cvbuild
35+
cd $_cvbuild
3636

3737
push_arm
3838

39-
#try set > opencv_p4y_env.log # export env vars for debugging
40-
41-
export ANDROID_NDK=$ANDROIDNDK
42-
try cmake -DP4A=ON -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -DCMAKE_TOOLCHAIN_FILE=$_cvsrc/platforms/android/android.toolchain.cmake \
43-
-DPYTHON_INCLUDE_PATH=$_pyroot/include/python2.7 -DPYTHON_LIBRARY=$_pyroot/lib/libpython2.7.so \
44-
-DPYTHON_NUMPY_INCLUDE_DIR=$SITEPACKAGES_PATH/numpy/core/include \
45-
-DANDROID_EXECUTABLE=$ANDROIDSDK/tools/android \
46-
-DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_ANDROID_EXAMPLES=OFF \
47-
-DPYTHON_PACKAGES_PATH=$SITEPACKAGES_PATH \
48-
$_cvsrc
49-
try make -j8 opencv_python
50-
try cmake -DCOMPONENT=python -P ./cmake_install.cmake
39+
export ANDROID_NDK=$ANDROIDNDK
40+
try cmake -DP4A=ON -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -DCMAKE_TOOLCHAIN_FILE=$_cvsrc/platforms/android/android.toolchain.cmake \
41+
-DPYTHON_INCLUDE_PATH=$_pyroot/include/python2.7 -DPYTHON_LIBRARY=$_pyroot/lib/libpython2.7.so \
42+
-DPYTHON_NUMPY_INCLUDE_DIR=$SITEPACKAGES_PATH/numpy/core/include \
43+
-DANDROID_EXECUTABLE=$ANDROIDSDK/tools/android \
44+
-DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_ANDROID_EXAMPLES=OFF \
45+
-DPYTHON_PACKAGES_PATH=$SITEPACKAGES_PATH \
46+
$_cvsrc
47+
try make -j8 opencv_python
48+
try cmake -DCOMPONENT=python -P ./cmake_install.cmake
5149

5250
pop_arm
5351
}

0 commit comments

Comments
 (0)