SHARE
TWEET

fsh.patch

a guest Jun 22nd, 2016 45 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. From 2bb4ca7cc656969a9e2c655e594428b465edbfed Mon Sep 17 00:00:00 2001
  2. From: Valentin Churavy <v.churavy@gmail.com>
  3. Date: Sat, 28 Mar 2015 01:30:01 +0900
  4. Subject: [PATCH] fsh.patch
  5.  
  6. ---
  7. CMakeLists.txt                                  | 14 +++++++-------
  8.  cmake/templates/opencv_run_all_tests_unix.sh.in |  2 +-
  9.  2 files changed, 8 insertions(+), 8 deletions(-)
  10.  
  11. diff --git a/CMakeLists.txt b/CMakeLists.txt
  12. index 11a6408..22878f6 100644
  13. --- a/CMakeLists.txt
  14. +++ b/CMakeLists.txt
  15. @@ -317,7 +317,7 @@ endif()
  16.  if(ANDROID OR WIN32)
  17.    ocv_update(OPENCV_DOC_INSTALL_PATH doc)
  18.  else()
  19. -  ocv_update(OPENCV_DOC_INSTALL_PATH share/OpenCV/doc)
  20. +  ocv_update(OPENCV_DOC_INSTALL_PATH share/opencv/doc)
  21.  endif()
  22.  
  23.  if(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
  24. @@ -359,7 +359,7 @@ if(OPENCV_TEST_DATA_PATH AND NOT OPENCV_TEST_DATA_INSTALL_PATH)
  25.    elseif(WIN32)
  26.      ocv_update(OPENCV_TEST_DATA_INSTALL_PATH "testdata")
  27.    else()
  28. -    ocv_update(OPENCV_TEST_DATA_INSTALL_PATH "share/OpenCV/testdata")
  29. +    ocv_update(OPENCV_TEST_DATA_INSTALL_PATH "share/opencv/testdata")
  30.    endif()
  31.  endif()
  32.  
  33. @@ -389,17 +389,17 @@ else()
  34.      ocv_update(OPENCV_CONFIG_INSTALL_PATH  "")
  35.    else()
  36.      ocv_update(OPENCV_LIB_INSTALL_PATH     lib${LIB_SUFFIX})
  37. -    ocv_update(OPENCV_3P_LIB_INSTALL_PATH  share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH})
  38. -    ocv_update(OPENCV_SAMPLES_SRC_INSTALL_PATH    share/OpenCV/samples)
  39. -    ocv_update(OPENCV_JAR_INSTALL_PATH share/OpenCV/java)
  40. -    ocv_update(OPENCV_OTHER_INSTALL_PATH   share/OpenCV)
  41. +    ocv_update(OPENCV_3P_LIB_INSTALL_PATH  share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH})
  42. +    ocv_update(OPENCV_SAMPLES_SRC_INSTALL_PATH    share/opencv/samples)
  43. +    ocv_update(OPENCV_JAR_INSTALL_PATH share/opencv/java)
  44. +    ocv_update(OPENCV_OTHER_INSTALL_PATH   share/opencv)
  45.  
  46.      if(NOT DEFINED OPENCV_CONFIG_INSTALL_PATH)
  47.        math(EXPR SIZEOF_VOID_P_BITS "8 * ${CMAKE_SIZEOF_VOID_P}")
  48.        if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX)
  49.          ocv_update(OPENCV_CONFIG_INSTALL_PATH lib${LIB_SUFFIX}/cmake/opencv)
  50.        else()
  51. -        ocv_update(OPENCV_CONFIG_INSTALL_PATH share/OpenCV)
  52. +        ocv_update(OPENCV_CONFIG_INSTALL_PATH share/opencv)
  53.        endif()
  54.      endif()
  55.    endif()
  56.  
  57.  
  58. diff --git a/cmake/templates/opencv_run_all_tests_unix.sh.in b/cmake/templates/opencv_run_all_tests_unix.sh.in
  59. index 7b946af..82370dc 100644
  60. --- a/cmake/templates/opencv_run_all_tests_unix.sh.in
  61. +++ b/cmake/templates/opencv_run_all_tests_unix.sh.in
  62. @@ -53,7 +53,7 @@ fi
  63.  
  64.  OPENCV_TEST_PATH=@CMAKE_INSTALL_PREFIX@/@OPENCV_TEST_INSTALL_PATH@
  65.  OPENCV_PYTHON_TESTS=@OPENCV_PYTHON_TESTS_LIST@
  66. -export OPENCV_TEST_DATA_PATH=@CMAKE_INSTALL_PREFIX@/share/OpenCV/testdata
  67. +export OPENCV_TEST_DATA_PATH=@CMAKE_INSTALL_PREFIX@/share/opencv/testdata
  68.  
  69.  # Run tests
  70.  
  71. --
  72. 2.4.2
RAW Paste Data
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy. OK, I Understand
 
Top