From 116d3be9c05f3bcf3aaec97ec1f018e316155d5c Mon Sep 17 00:00:00 2001 From: Andrey Pavlenko Date: Tue, 5 Mar 2013 18:41:44 +0400 Subject: [PATCH] moving JNI library to 'build/lib' dir on non-Win --- modules/java/CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/java/CMakeLists.txt b/modules/java/CMakeLists.txt index 2639fe5..4dcde5e 100644 --- a/modules/java/CMakeLists.txt +++ b/modules/java/CMakeLists.txt @@ -303,15 +303,16 @@ 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}) +else() + set_target_properties(${the_module} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}) endif() if(ENABLE_SOLUTION_FOLDERS) -- 2.7.4