diff --git a/cmake/OpenCVPCHSupport.cmake b/cmake/OpenCVPCHSupport.cmake index 16dbb06a9d..f65e27ff55 100644 --- a/cmake/OpenCVPCHSupport.cmake +++ b/cmake/OpenCVPCHSupport.cmake @@ -113,6 +113,7 @@ MACRO(_PCH_GET_COMPILE_COMMAND out_command _input _output) SET(${out_command} ${CMAKE_CXX_COMPILER} ${pchsupport_compiler_cxx_arg1} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input} ) + message("!!!!!!!!!!!!!!!!${${out_command}}!!!!") ELSE(CMAKE_CXX_COMPILER_ARG1) SET(${out_command} ${CMAKE_CXX_COMPILER} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input} diff --git a/samples/android/15-puzzle/AndroidManifest.xml b/samples/android/15-puzzle/AndroidManifest.xml index 02a6cc975b..5c60b62a4c 100644 --- a/samples/android/15-puzzle/AndroidManifest.xml +++ b/samples/android/15-puzzle/AndroidManifest.xml @@ -1,17 +1,11 @@ + package="org.opencv.samples.puzzle15" + android:versionCode="21" + android:versionName="2.1"> - - - - + @@ -22,9 +16,19 @@ + + - - + + + + + + \ No newline at end of file diff --git a/samples/android/color-blob-detection/AndroidManifest.xml b/samples/android/color-blob-detection/AndroidManifest.xml index a580be645d..f8bf4939dc 100644 --- a/samples/android/color-blob-detection/AndroidManifest.xml +++ b/samples/android/color-blob-detection/AndroidManifest.xml @@ -1,27 +1,34 @@ + package="org.opencv.example.colorblobdetect" + android:versionCode="21" + android:versionName="2.1" > - - - - + + - + + + + - - + + + + + \ No newline at end of file diff --git a/samples/android/face-detection/AndroidManifest.xml b/samples/android/face-detection/AndroidManifest.xml index 285bcb9fa0..eaa90dfd08 100644 --- a/samples/android/face-detection/AndroidManifest.xml +++ b/samples/android/face-detection/AndroidManifest.xml @@ -1,14 +1,8 @@ - - + package="org.opencv.samples.fd" + android:versionCode="21" + android:versionName="2.1"> + + - - + + + + + diff --git a/samples/android/image-manipulations/AndroidManifest.xml b/samples/android/image-manipulations/AndroidManifest.xml index 72df75e445..b83f799fe0 100644 --- a/samples/android/image-manipulations/AndroidManifest.xml +++ b/samples/android/image-manipulations/AndroidManifest.xml @@ -1,14 +1,8 @@ - - + package="org.opencv.samples.imagemanipulations" + android:versionCode="21" + android:versionName="2.1"> + + - - + + + + + diff --git a/samples/android/tutorial-0-androidcamera/AndroidManifest.xml b/samples/android/tutorial-0-androidcamera/AndroidManifest.xml index 714b0095aa..d703810c14 100644 --- a/samples/android/tutorial-0-androidcamera/AndroidManifest.xml +++ b/samples/android/tutorial-0-androidcamera/AndroidManifest.xml @@ -1,20 +1,8 @@ - - - - - - - - + package="org.opencv.samples.tutorial0" + android:versionCode="21" + android:versionName="2.1"> + + + + + + + + + + diff --git a/samples/android/tutorial-1-addopencv/AndroidManifest.xml b/samples/android/tutorial-1-addopencv/AndroidManifest.xml index 51cc50f7f9..5ec908429a 100644 --- a/samples/android/tutorial-1-addopencv/AndroidManifest.xml +++ b/samples/android/tutorial-1-addopencv/AndroidManifest.xml @@ -1,14 +1,8 @@ - - + package="org.opencv.samples.tutorial1" + android:versionCode="21" + android:versionName="2.1"> + + - - + + + + + diff --git a/samples/android/tutorial-2-opencvcamera/AndroidManifest.xml b/samples/android/tutorial-2-opencvcamera/AndroidManifest.xml index 7daacd164b..71e9c99857 100644 --- a/samples/android/tutorial-2-opencvcamera/AndroidManifest.xml +++ b/samples/android/tutorial-2-opencvcamera/AndroidManifest.xml @@ -1,14 +1,8 @@ - - + package="org.opencv.samples.tutorial2" + android:versionCode="21" + android:versionName="2.1"> + + - - + + + + + diff --git a/samples/android/tutorial-3-native/AndroidManifest.xml b/samples/android/tutorial-3-native/AndroidManifest.xml index 8ee38142ba..b8cd0488e3 100644 --- a/samples/android/tutorial-3-native/AndroidManifest.xml +++ b/samples/android/tutorial-3-native/AndroidManifest.xml @@ -1,14 +1,8 @@ - - + package="org.opencv.samples.tutorial3" + android:versionCode="21" + android:versionName="2.1"> + + - - + + + + + diff --git a/samples/android/tutorial-4-mixed/AndroidManifest.xml b/samples/android/tutorial-4-mixed/AndroidManifest.xml index 524c76399a..51460d34b3 100644 --- a/samples/android/tutorial-4-mixed/AndroidManifest.xml +++ b/samples/android/tutorial-4-mixed/AndroidManifest.xml @@ -1,14 +1,8 @@ - - + package="org.opencv.samples.tutorial4" + android:versionCode="21" + android:versionName="2.1"> + + - - + + + + +