]>
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 | |
01c6bd4e JR |
3 | @@ -445,14 +445,7 @@ |
4 | ocv_update(OPENCV_JAR_INSTALL_PATH share/OpenCV/java) | |
5 | ocv_update(OPENCV_OTHER_INSTALL_PATH share/OpenCV) | |
e36ac029 | 6 | |
01c6bd4e JR |
7 | - if(NOT DEFINED OPENCV_CONFIG_INSTALL_PATH) |
8 | - math(EXPR SIZEOF_VOID_P_BITS "8 * ${CMAKE_SIZEOF_VOID_P}") | |
9 | - if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX) | |
10 | - ocv_update(OPENCV_CONFIG_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX}/cmake/opencv) | |
11 | - else() | |
12 | - ocv_update(OPENCV_CONFIG_INSTALL_PATH share/OpenCV) | |
13 | - endif() | |
14 | - endif() | |
e36ac029 | 15 | + set(OPENCV_CONFIG_INSTALL_PATH share/OpenCV) |
01c6bd4e JR |
16 | endif() |
17 | ocv_update(OPENCV_INCLUDE_INSTALL_PATH "include") | |
e36ac029 | 18 | endif() |