1 --- OpenCV-2.2.0/modules/highgui/CMakeLists.txt~ 2010-12-05 04:35:24.000000000 +0100
2 +++ OpenCV-2.2.0/modules/highgui/CMakeLists.txt 2010-12-07 13:43:58.544879668 +0100
5 install(TARGETS ${the_target}
6 RUNTIME DESTINATION bin COMPONENT main
7 - LIBRARY DESTINATION lib COMPONENT main
8 - ARCHIVE DESTINATION lib COMPONENT main)
9 + LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
10 + ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
12 install(FILES ${highgui_ext_hdrs}
13 DESTINATION include/opencv2/highgui
14 --- OpenCV-2.2.0/modules/gpu/CMakeLists.txt~ 2010-12-07 13:41:30.061546334 +0100
15 +++ OpenCV-2.2.0/modules/gpu/CMakeLists.txt 2010-12-07 13:44:31.161546335 +0100
18 install(TARGETS ${the_target}
19 RUNTIME DESTINATION bin COMPONENT main
20 - LIBRARY DESTINATION lib COMPONENT main
21 - ARCHIVE DESTINATION lib COMPONENT main)
22 + LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
23 + ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
25 install(FILES ${lib_hdrs}
26 DESTINATION include/opencv2/${name}
27 --- OpenCV-2.2.0/modules/ffmpeg/CMakeLists.txt~ 2010-12-05 04:35:24.000000000 +0100
28 +++ OpenCV-2.2.0/modules/ffmpeg/CMakeLists.txt 2010-12-07 13:45:03.004879667 +0100
31 install(TARGETS ${the_target}
32 RUNTIME DESTINATION bin COMPONENT main
33 - ARCHIVE DESTINATION lib COMPONENT main
34 - LIBRARY DESTINATION lib COMPONENT main
35 + ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main
36 + LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
38 --- OpenCV-2.2.0/CMakeLists.txt~ 2010-12-07 13:49:56.981546334 +0100
39 +++ OpenCV-2.2.0/CMakeLists.txt 2010-12-07 13:50:17.114879668 +0100
42 string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}")
44 - set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
45 - set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
46 + set(PYTHON_PLUGIN_INSTALL_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
47 + set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
50 get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE)