Skip to content

O
opencv
Commit e8358786 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #6006 from mleotta:fix-install-name-dir

parents 85793d01 912592de
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 5 deletions
apps/annotation/CMakeLists.txt
View file @ e8358786
...@@ -20,7 +20,6 @@ set_target_properties(${the_target} PROPERTIES ...@@ -20,7 +20,6 @@ set_target_properties(${the_target} PROPERTIES
DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}" DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH} ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
INSTALL_NAME_DIR lib
OUTPUT_NAME "opencv_annotation") OUTPUT_NAME "opencv_annotation")
if(ENABLE_SOLUTION_FOLDERS) if(ENABLE_SOLUTION_FOLDERS)
......
apps/haartraining/CMakeLists.txt
View file @ e8358786
...@@ -38,7 +38,6 @@ set_target_properties(opencv_haartraining_engine PROPERTIES ...@@ -38,7 +38,6 @@ set_target_properties(opencv_haartraining_engine PROPERTIES
DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}" DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH} ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
INSTALL_NAME_DIR lib
) )
# ----------------------------------------------------------- # -----------------------------------------------------------
......
apps/traincascade/CMakeLists.txt
View file @ e8358786
...@@ -26,7 +26,6 @@ set_target_properties(${the_target} PROPERTIES ...@@ -26,7 +26,6 @@ set_target_properties(${the_target} PROPERTIES
DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}" DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH} ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
INSTALL_NAME_DIR lib
OUTPUT_NAME "opencv_traincascade") OUTPUT_NAME "opencv_traincascade")
if(ENABLE_SOLUTION_FOLDERS) if(ENABLE_SOLUTION_FOLDERS)
......
cmake/OpenCVModule.cmake
View file @ e8358786
...@@ -594,7 +594,6 @@ macro(ocv_create_module) ...@@ -594,7 +594,6 @@ macro(ocv_create_module)
ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH} ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH} LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
INSTALL_NAME_DIR lib
) )
# For dynamic link numbering convenions # For dynamic link numbering convenions
......
platforms/android/libinfo/CMakeLists.txt
View file @ e8358786
...@@ -34,7 +34,6 @@ add_library(opencv_info SHARED info.c) ...@@ -34,7 +34,6 @@ add_library(opencv_info SHARED info.c)
set_target_properties(${the_module} PROPERTIES set_target_properties(${the_module} PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH} ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
INSTALL_NAME_DIR lib
) )
get_filename_component(lib_name "libopencv_info.so" NAME) get_filename_component(lib_name "libopencv_info.so" NAME)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment