Preparing to rebase
This commit is contained in:
hbristow
@@ -1,66 +0,0 @@
|
||||
CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
|
||||
|
||||
#########################################################
|
||||
# Set project name
|
||||
#########################################################
|
||||
|
||||
IF( NOT PROJECT_NAME )
|
||||
IF ( NOT "x$ENV{PROJECT_NAME}" STREQUAL "x" )
|
||||
SET( PROJECT_NAME $ENV{PROJECT_NAME} )
|
||||
ELSE()
|
||||
SET( PROJECT_NAME hello-android )
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
SET( PROJECT_NAME ${PROJECT_NAME} CACHE STRING "The name of your project")
|
||||
|
||||
PROJECT( ${PROJECT_NAME} )
|
||||
|
||||
#########################################################
|
||||
# Find OpenCV
|
||||
#########################################################
|
||||
|
||||
FIND_PACKAGE( OpenCV REQUIRED )
|
||||
|
||||
#########################################################
|
||||
# c/c++ flags, includes and lib dependencies
|
||||
#########################################################
|
||||
|
||||
#notice the "recycling" of CMAKE_C_FLAGS
|
||||
#this is necessary to pick up android flags
|
||||
SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pedantic" )
|
||||
SET( CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} -Wall -pedantic" )
|
||||
|
||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
SET( LIBRARY_DEPS ${OpenCV_LIBS} )
|
||||
IF( ANDROID )
|
||||
SET( LIBRARY_DEPS ${LIBRARY_DEPS} log dl )
|
||||
ENDIF()
|
||||
|
||||
#########################################################
|
||||
# source files
|
||||
#########################################################
|
||||
|
||||
FILE( GLOB hdrs "*.h*" )
|
||||
FILE( GLOB srcs "*.cpp" )
|
||||
|
||||
ADD_EXECUTABLE( ${PROJECT_NAME} ${srcs} )
|
||||
TARGET_LINK_LIBRARIES( ${PROJECT_NAME} ${LIBRARY_DEPS} )
|
||||
|
||||
#########################################################
|
||||
# Summary report
|
||||
#########################################################
|
||||
message( STATUS "")
|
||||
message( STATUS "General configuration for ${PROJECT_NAME} =====================================")
|
||||
message( STATUS "")
|
||||
message( STATUS " OpenCV path: ${OpenCV_DIR}")
|
||||
message( STATUS " Compiler: ${CMAKE_CXX_COMPILER}")
|
||||
message( STATUS " C++ flags (Release): ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}")
|
||||
message( STATUS " C++ flags (Debug): ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}")
|
||||
if(WIN32)
|
||||
message( STATUS " Linker flags (Release): ${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_RELEASE}")
|
||||
message( STATUS " Linker flags (Debug): ${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_DEBUG}")
|
||||
else()
|
||||
message( STATUS " Linker flags (Release): ${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS_RELEASE}")
|
||||
message( STATUS " Linker flags (Debug): ${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS_DEBUG}")
|
||||
endif()
|
||||
@@ -1,9 +0,0 @@
|
||||
@ECHO OFF
|
||||
SETLOCAL
|
||||
PUSHD %~dp0
|
||||
SET PROJECT_NAME=hello-android
|
||||
SET BUILD_DIR=build_armeabi
|
||||
SET ANDROID_ABI=armeabi
|
||||
CALL ..\..\..\android\scripts\build.cmd %*
|
||||
POPD
|
||||
ENDLOCAL
|
||||
@@ -1,13 +0,0 @@
|
||||
#!/bin/sh
|
||||
cd `dirname $0`
|
||||
|
||||
BUILD_DIR=build_armeabi
|
||||
opencv_android=`pwd`/../../../android
|
||||
opencv_build_dir=$opencv_android/$BUILD_DIR
|
||||
|
||||
mkdir -p $BUILD_DIR
|
||||
cd $BUILD_DIR
|
||||
|
||||
RUN_CMAKE="cmake -DOpenCV_DIR=$opencv_build_dir -DARM_TARGET=armeabi -DCMAKE_TOOLCHAIN_FILE=$opencv_android/android.toolchain.cmake .."
|
||||
echo $RUN_CMAKE
|
||||
$RUN_CMAKE
|
||||
@@ -1,49 +0,0 @@
|
||||
:: this batch file copies compiled executable to the device,
|
||||
:: runs it and gets resulting image back to the host
|
||||
::
|
||||
:: Here is sample output of successful run:
|
||||
::
|
||||
:: 204 KB/s (2887388 bytes in 13.790s)
|
||||
:: Hello Android!
|
||||
:: 304 KB/s (8723 bytes in 0.028s)
|
||||
|
||||
@ECHO OFF
|
||||
|
||||
:: enable command extensions
|
||||
VERIFY BADVALUE 2>NUL
|
||||
SETLOCAL ENABLEEXTENSIONS || (ECHO Unable to enable command extensions. & EXIT \B)
|
||||
|
||||
PUSHD %~dp0
|
||||
:: project specific settings
|
||||
SET PROJECT_NAME=hello-android
|
||||
|
||||
:: try to load config file
|
||||
SET CFG_PATH=..\..\..\android\scripts\wincfg.cmd
|
||||
IF EXIST %CFG_PATH% CALL %CFG_PATH%
|
||||
|
||||
:: check if sdk path defined
|
||||
IF NOT DEFINED ANDROID_SDK (ECHO. & ECHO You should set an environment variable ANDROID_SDK to the full path to your copy of Android SDK & GOTO end)
|
||||
(PUSHD "%ANDROID_SDK%" 2>NUL && POPD) || (ECHO. & ECHO Directory "%ANDROID_SDK%" specified by ANDROID_SDK variable does not exist & GOTO end)
|
||||
SET adb=%ANDROID_SDK%\platform-tools\adb.exe
|
||||
|
||||
:: copy file to device (usually takes 10 seconds or more)
|
||||
%adb% push .\bin\%PROJECT_NAME% /data/bin/sample/%PROJECT_NAME% || GOTO end
|
||||
|
||||
:: set execute permission
|
||||
%adb% shell chmod 777 /data/bin/sample/%PROJECT_NAME% || GOTO end
|
||||
|
||||
:: execute our application
|
||||
%adb% shell /data/bin/sample/%PROJECT_NAME% || GOTO end
|
||||
|
||||
:: get image result from device
|
||||
%adb% pull /mnt/sdcard/HelloAndroid.png || GOTO end
|
||||
|
||||
GOTO end
|
||||
|
||||
:: cleanup (comment out GOTO above to enable cleanup)
|
||||
%adb% shell rm /data/bin/sample/%PROJECT_NAME%
|
||||
%adb% shell rm /mnt/sdcard/HelloAndroid.png
|
||||
|
||||
:end
|
||||
POPD
|
||||
ENDLOCAL
|
||||
@@ -1,15 +0,0 @@
|
||||
#!/bin/sh
|
||||
cd `dirname $0`
|
||||
PROJECT_NAME=hello-android
|
||||
|
||||
# copy file to device (usually takes 10 seconds or more)
|
||||
adb push ./bin/$PROJECT_NAME /data/bin/sample/$PROJECT_NAME || return
|
||||
|
||||
# set execute permission
|
||||
adb shell chmod 777 /data/bin/sample/$PROJECT_NAME || return
|
||||
|
||||
# execute our application
|
||||
adb shell /data/bin/sample/$PROJECT_NAME || return
|
||||
|
||||
# get image result from device
|
||||
adb pull /mnt/sdcard/HelloAndroid.png || return
|
||||
Reference in New Issue
Block a user