Add option to run java tests with run.py

2013-01-22 19:43:54 +04:00
parent 46c4390a2e
commit 3889b34ec3
5 changed files with 73 additions and 49 deletions
--- a/modules/java/CMakeLists.txt
+++ b/modules/java/CMakeLists.txt
@@ -303,6 +303,12 @@ set_target_properties(${the_module} PROPERTIES
    LINK_INTERFACE_LIBRARIES ""
    )

+if(ANDROID)
+  set_target_properties(${the_module} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH})
+else()
+  set_target_properties(${the_module} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
+endif()
+
 if(ENABLE_SOLUTION_FOLDERS)
  set_target_properties(${the_module} PROPERTIES FOLDER "bindings")
 endif()