diff --git a/cmake/OpenCVPCHSupport.cmake b/cmake/OpenCVPCHSupport.cmake index 16dbb06a9dddad6ceaba10bfac9721cb2cdffe54..f65e27ff5546e856534279fc0100a538579d8a7a 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 02a6cc975b9926adecf1b081f742a76ef9da5105..5c60b62a4cf75139066028ef9102e106210af1ac 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 a580be645d93e4816d55f6abb8fde4d2f178556c..f8bf4939dc95bd4042b50d39602b200837296a90 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 285bcb9fa05a42073dbbe8e0f0f866574891d404..eaa90dfd08de18cc40aaca09ce803ec47d4d8e6a 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 72df75e4450da5429152ee0641138c1addeb9cb3..b83f799fe02d98001e5bd8122306575df2dbc121 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 714b0095aa65389062d52ec85ab9982f1477470d..d703810c140b0c65e96aa37350f825d46eb762b2 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 51cc50f7f9b545b9bc8ba7305fcc7bccabbce7c5..5ec908429ad822c2b9be4e3f99cd70898ab064dc 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 7daacd164b24f08a98d094173eb6e08a9c8b8d75..71e9c998573bcf11c93054e66ce9d340e452a785 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 8ee38142bad3dbf87d1027e8f27445a19ab37c58..b8cd0488e39b3fb0793c3e5b5289e43e8aab52cb 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 524c76399af321dc58b0929e4d3e203ba10e2273..51460d34b32c884d8528fab35dd19b38c7de6096 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"> + + - - + + + + +