Hardly refactored CMake script for Java wrappers

cmake/OpenCVDetectAndroidSDK.cmake

@@ -302,7 +302,7 @@ macro(add_android_project target path)
          COMMAND ${CMAKE_COMMAND} -E touch "${android_proj_bin_dir}/bin/${target}-debug.apk" # needed because ant does not update the timestamp of updated apk
          WORKING_DIRECTORY "${android_proj_bin_dir}"
          MAIN_DEPENDENCY "${android_proj_bin_dir}/${ANDROID_MANIFEST_FILE}"
-         DEPENDS "${OpenCV_BINARY_DIR}/bin/.classes.jar.dephelper" opencv_java # as we are part of OpenCV we can just force this dependency
+         DEPENDS "${OpenCV_BINARY_DIR}/bin/classes.jar.dephelper" opencv_java # as we are part of OpenCV we can just force this dependency
          DEPENDS ${android_proj_file_deps} ${JNI_LIB_NAME})
     endif()
 

modules/java/android_test/CMakeLists.txt

@@ -47,7 +47,7 @@ add_custom_command(
     COMMAND ${CMAKE_COMMAND} -E touch "${opencv_test_java_bin_dir}/bin/OpenCVTest-debug.apk" # needed because ant does not update the timestamp of updated apk
     WORKING_DIRECTORY "${opencv_test_java_bin_dir}"
     MAIN_DEPENDENCY "${opencv_test_java_bin_dir}/${ANDROID_MANIFEST_FILE}"
-    DEPENDS "${OpenCV_BINARY_DIR}/bin/.classes.jar.dephelper" opencv_java
+    DEPENDS "${JAR_FILE}.dephelper" opencv_java
     DEPENDS ${opencv_test_java_file_deps})
 
 add_custom_target(${PROJECT_NAME} ALL SOURCES "${opencv_test_java_bin_dir}/bin/OpenCVTest-debug.apk" )

modules/java/jar/build.xml → modules/java/build.xml.in

@@ -10,6 +10,6 @@
       <include name="**/*.java"/>
     </javac>
 
-    <jar basedir="src" destfile="bin/opencv-@OPENCV_VERSION@.jar"/>
+    <jar basedir="src" destfile="bin/@JAR_NAME@"/>
   </target>
 </project>
\ No newline at end of file

modules/java/java_test/build.xml → modules/java/test/build.xml

@@ -37,7 +37,7 @@
       <sysproperty key="java.library.path" path="${javaLibraryPath}"/>
       <classpath refid="master-classpath"/>
       <classpath>
-      	<pathelement location="build/classes"/>
+        <pathelement location="build/classes"/>
       </classpath>
 
       <formatter type="xml"/>

modules/java/java_test/src/org/opencv/test/OpenCVTestRunner.java → modules/java/test/src/org/opencv/test/OpenCVTestRunner.java

@@ -39,6 +39,6 @@ public class OpenCVTestRunner {
 
     public static String getOutputFileName(String name)
     {
-	return getTempFileName(name);
+        return getTempFileName(name);
     }
 }

modules/python/CMakeLists.txt

@@ -80,6 +80,10 @@ set_target_properties(${the_module} PROPERTIES
                       OUTPUT_NAME cv2
                       SUFFIX ${CVPY_SUFFIX})
 
+if(ENABLE_SOLUTION_FOLDERS)
+  set_target_properties(${the_module} PROPERTIES FOLDER "bindings")
+endif()
+
 if(CMAKE_COMPILER_IS_GNUCXX AND NOT ENABLE_NOISY_WARNINGS)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-function")
 endif()