]>
Commit | Line | Data |
---|---|---|
e36ac029 JR |
1 | --- opencv-2.4.10.1/CMakeLists.txt~ 2015-03-09 14:42:05.000000000 +0100 |
2 | +++ opencv-2.4.10.1/CMakeLists.txt 2015-03-09 14:50:49.355937198 +0100 | |
3 | @@ -324,12 +324,7 @@ | |
4 | endif() | |
5 | set(OPENCV_INCLUDE_INSTALL_PATH "include") | |
6 | ||
7 | - math(EXPR SIZEOF_VOID_P_BITS "8 * ${CMAKE_SIZEOF_VOID_P}") | |
8 | - if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX) | |
9 | - set(OPENCV_CONFIG_INSTALL_PATH lib${LIB_SUFFIX}/cmake/opencv) | |
10 | - else() | |
11 | - set(OPENCV_CONFIG_INSTALL_PATH share/OpenCV) | |
12 | - endif() | |
13 | + set(OPENCV_CONFIG_INSTALL_PATH share/OpenCV) | |
14 | endif() | |
15 | ||
16 | set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${OPENCV_LIB_INSTALL_PATH}") |