Merge pull request #620 from apavlenko:java_tutorial_fix

13f402a5 · Andrey Kamaev · OpenCV Buildbot · bbac4bc4 · 0e64baae · 13f402a5
Commit 13f402a5 authored Mar 06, 2013 by Andrey Kamaev Committed by OpenCV Buildbot Mar 06, 2013
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

java_dev_intro.rst doc/tutorials/introduction/desktop_java/java_dev_intro.rst +0 -0

CMakeLists.txt modules/java/CMakeLists.txt +2 -4

No files found.
--- a/doc/tutorials/introduction/desktop_java/java_dev_intro.rst
+++ b/doc/tutorials/introduction/desktop_java/java_dev_intro.rst
--- a/modules/java/CMakeLists.txt
+++ b/modules/java/CMakeLists.txt
@@ -301,16 +301,14 @@ endif()
 # Additional target properties
 set_target_properties(${the_module} PROPERTIES
    OUTPUT_NAME "${the_module}${LIB_NAME_SUFIX}"
-    #DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
    ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
+    LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
    RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
    INSTALL_NAME_DIR ${OPENCV_LIB_INSTALL_PATH}
    LINK_INTERFACE_LIBRARIES ""
    )

-if(ANDROID)
-  set_target_properties(${the_module} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH})
-else()
+if(WIN32)
  set_target_properties(${the_module} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 endif()