View | Details | Raw Unified | Return to bug 29345
Collapse All | Expand All

(-)OpenCVConfig.cmake~ (-1 / +1 lines)
Lines 58-64 set(OpenCV_USE_MANGLED_PATHS FALSE) Link Here
58
get_filename_component(OpenCV_CONFIG_PATH "${CMAKE_CURRENT_LIST_FILE}" PATH CACHE)
58
get_filename_component(OpenCV_CONFIG_PATH "${CMAKE_CURRENT_LIST_FILE}" PATH CACHE)
59
59
60
if(NOT WIN32 OR OpenCV_ANDROID_NATIVE_API_LEVEL GREATER 0)
60
if(NOT WIN32 OR OpenCV_ANDROID_NATIVE_API_LEVEL GREATER 0)
61
  set(OpenCV_INSTALL_PATH "${OpenCV_CONFIG_PATH}/../../..")
61
  set(OpenCV_INSTALL_PATH "/usr")
62
  # Get the absolute path with no ../.. relative marks, to eliminate implicit linker warnings
62
  # Get the absolute path with no ../.. relative marks, to eliminate implicit linker warnings
63
  if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_LESS 2.8)
63
  if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_LESS 2.8)
64
    get_filename_component(OpenCV_INSTALL_PATH "${OpenCV_INSTALL_PATH}" ABSOLUTE)
64
    get_filename_component(OpenCV_INSTALL_PATH "${OpenCV_INSTALL_PATH}" ABSOLUTE)

Return to bug 29345