From: Andrey Kamaev Date: Fri, 6 May 2011 20:53:55 +0000 (+0000) Subject: Added missed CMakeCache.android.initial.cmake to windows build scripts X-Git-Tag: accepted/2.0/20130307.220821~3208 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c67f1a25519638bb9d33e8b8d6adcf093d21bcfa;p=profile%2Fivi%2Fopencv.git Added missed CMakeCache.android.initial.cmake to windows build scripts --- diff --git a/android/scripts/cmake_android.cmd b/android/scripts/cmake_android.cmd index 40e839c..9cd848f 100644 --- a/android/scripts/cmake_android.cmd +++ b/android/scripts/cmake_android.cmd @@ -8,4 +8,4 @@ SET CMAKE_EXE=C:\apps\cmake\bin\cmake.exe SET MAKE_EXE=C:\apps\gnuport\make.exe cd build -%CMAKE_EXE% -G"Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=..\android.toolchain.cmake -DCMAKE_MAKE_PROGRAM=%MAKE_EXE% ..\.. +%CMAKE_EXE% -C ../CMakeCache.android.initial.cmake -G"Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=..\android.toolchain.cmake -DCMAKE_MAKE_PROGRAM=%MAKE_EXE% ..\.. diff --git a/android/scripts/cmake_android_armeabi.cmd b/android/scripts/cmake_android_armeabi.cmd index 9e2f263..69dfb56 100644 --- a/android/scripts/cmake_android_armeabi.cmd +++ b/android/scripts/cmake_android_armeabi.cmd @@ -8,4 +8,4 @@ SET CMAKE_EXE=C:\apps\cmake\bin\cmake.exe SET MAKE_EXE=C:\apps\gnuport\make.exe cd build -%CMAKE_EXE% -G"Unix Makefiles" -DARM_TARGET=armeabi -DCMAKE_TOOLCHAIN_FILE=..\android.toolchain.cmake -DCMAKE_MAKE_PROGRAM=%MAKE_EXE% ..\.. +%CMAKE_EXE% -C ../CMakeCache.android.initial.cmake -G"Unix Makefiles" -DARM_TARGET=armeabi -DCMAKE_TOOLCHAIN_FILE=..\android.toolchain.cmake -DCMAKE_MAKE_PROGRAM=%MAKE_EXE% ..\.. diff --git a/android/scripts/cmake_android_neon.cmd b/android/scripts/cmake_android_neon.cmd index 5974661..4f74e7e 100644 --- a/android/scripts/cmake_android_neon.cmd +++ b/android/scripts/cmake_android_neon.cmd @@ -8,4 +8,4 @@ SET CMAKE_EXE=C:\apps\cmake\bin\cmake.exe SET MAKE_EXE=C:\apps\gnuport\make.exe cd build -%CMAKE_EXE% -G"Unix Makefiles" -DARM_TARGET="armeabi-v7a with NEON" -DCMAKE_TOOLCHAIN_FILE=..\android.toolchain.cmake -DCMAKE_MAKE_PROGRAM=%MAKE_EXE% ..\.. +%CMAKE_EXE% -C ../CMakeCache.android.initial.cmake -G"Unix Makefiles" -DARM_TARGET="armeabi-v7a with NEON" -DCMAKE_TOOLCHAIN_FILE=..\android.toolchain.cmake -DCMAKE_MAKE_PROGRAM=%MAKE_EXE% ..\..