133 lines
6.5 KiB
Diff
133 lines
6.5 KiB
Diff
diff -up OpenCV-2.2.0/CMakeLists.txt.libdir OpenCV-2.2.0/CMakeLists.txt
|
|
--- OpenCV-2.2.0/CMakeLists.txt.libdir 2010-12-05 04:35:23.000000000 +0100
|
|
+++ OpenCV-2.2.0/CMakeLists.txt 2011-01-05 18:11:12.565218001 +0100
|
|
@@ -13,7 +13,7 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS tr
|
|
# Add these standard paths to the search paths for FIND_LIBRARY
|
|
# to find libraries from these locations first
|
|
if(UNIX)
|
|
- set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib /usr/lib)
|
|
+ set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib${LIB_SUFFIX} /usr/lib${LIB_SUFFIX})
|
|
endif()
|
|
# it _must_ go before PROJECT(OpenCV) in order to work
|
|
if (NOT CMAKE_INSTALL_PREFIX)
|
|
@@ -513,8 +515,8 @@ if(BUILD_NEW_PYTHON_SUPPORT)
|
|
|
|
string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}")
|
|
if(UNIX)
|
|
- set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
|
|
- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
|
|
+ set(PYTHON_PLUGIN_INSTALL_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
|
|
+ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
|
|
endif()
|
|
if(WIN32)
|
|
get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE)
|
|
diff -up OpenCV-2.2.0/modules/ffmpeg/CMakeLists.txt.libdir OpenCV-2.2.0/modules/ffmpeg/CMakeLists.txt
|
|
--- OpenCV-2.2.0/modules/ffmpeg/CMakeLists.txt.libdir 2010-12-05 04:35:24.000000000 +0100
|
|
+++ OpenCV-2.2.0/modules/ffmpeg/CMakeLists.txt 2011-01-05 18:11:12.531218000 +0100
|
|
@@ -43,12 +43,12 @@ set_target_properties(${the_target} PROP
|
|
VERSION ${OPENCV_VERSION}
|
|
OUTPUT_NAME "${the_target}${OPENCV_DLLVERSION}"
|
|
DEFINE_SYMBOL "CVAPI_EXPORTS"
|
|
- ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
|
|
+ ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/"
|
|
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
|
|
)
|
|
|
|
install(TARGETS ${the_target}
|
|
RUNTIME DESTINATION bin COMPONENT main
|
|
- ARCHIVE DESTINATION lib COMPONENT main
|
|
- LIBRARY DESTINATION lib COMPONENT main
|
|
+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main
|
|
+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
|
|
)
|
|
diff -up OpenCV-2.2.0/modules/gpu/CMakeLists.txt.libdir OpenCV-2.2.0/modules/gpu/CMakeLists.txt
|
|
--- OpenCV-2.2.0/modules/gpu/CMakeLists.txt.libdir 2010-12-05 04:35:24.000000000 +0100
|
|
+++ OpenCV-2.2.0/modules/gpu/CMakeLists.txt 2011-01-05 18:11:12.532218000 +0100
|
|
@@ -96,9 +96,9 @@ set_target_properties(${the_target} PROP
|
|
# Additional target properties
|
|
set_target_properties(${the_target} PROPERTIES
|
|
DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
|
|
- ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
|
|
+ ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/"
|
|
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
|
|
- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
|
|
+ INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}"
|
|
)
|
|
|
|
# Add the required libraries for linking:
|
|
@@ -124,8 +124,8 @@ add_dependencies(${the_target} ${DEPS})
|
|
|
|
install(TARGETS ${the_target}
|
|
RUNTIME DESTINATION bin COMPONENT main
|
|
- LIBRARY DESTINATION lib COMPONENT main
|
|
- ARCHIVE DESTINATION lib COMPONENT main)
|
|
+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
|
|
+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
|
|
|
|
install(FILES ${lib_hdrs}
|
|
DESTINATION include/opencv2/${name}
|
|
diff -up OpenCV-2.2.0/modules/highgui/CMakeLists.txt.libdir OpenCV-2.2.0/modules/highgui/CMakeLists.txt
|
|
--- OpenCV-2.2.0/modules/highgui/CMakeLists.txt.libdir 2010-12-05 04:35:24.000000000 +0100
|
|
+++ OpenCV-2.2.0/modules/highgui/CMakeLists.txt 2011-01-05 18:11:12.541218001 +0100
|
|
@@ -250,9 +250,9 @@ set_target_properties(${the_target} PROP
|
|
# Additional target properties
|
|
set_target_properties(${the_target} PROPERTIES
|
|
DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
|
|
- ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
|
|
+ ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/"
|
|
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
|
|
- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
|
|
+ INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}"
|
|
LINK_INTERFACE_LIBRARIES ""
|
|
)
|
|
|
|
@@ -302,8 +302,8 @@
|
|
|
|
install(TARGETS ${the_target}
|
|
RUNTIME DESTINATION bin COMPONENT main
|
|
- LIBRARY DESTINATION lib COMPONENT main
|
|
- ARCHIVE DESTINATION lib COMPONENT main)
|
|
+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
|
|
+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
|
|
|
|
install(FILES ${highgui_ext_hdrs}
|
|
DESTINATION include/opencv2/highgui
|
|
diff -up OpenCV-2.2.0/OpenCVModule.cmake.libdir OpenCV-2.2.0/OpenCVModule.cmake
|
|
--- OpenCV-2.2.0/OpenCVModule.cmake.libdir 2010-12-05 04:35:25.000000000 +0100
|
|
+++ OpenCV-2.2.0/OpenCVModule.cmake 2011-01-06 09:43:52.484218003 +0100
|
|
@@ -51,9 +51,9 @@ macro(define_opencv_module name)
|
|
# Additional target properties
|
|
set_target_properties(${the_target} PROPERTIES
|
|
DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
|
|
- ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
|
|
+ ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/"
|
|
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
|
|
- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
|
|
+ INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}"
|
|
)
|
|
|
|
# Add the required libraries for linking:
|
|
@@ -75,8 +75,8 @@ macro(define_opencv_module name)
|
|
|
|
install(TARGETS ${the_target}
|
|
RUNTIME DESTINATION bin COMPONENT main
|
|
- LIBRARY DESTINATION lib COMPONENT main
|
|
- ARCHIVE DESTINATION lib COMPONENT main)
|
|
+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
|
|
+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
|
|
|
|
install(FILES ${lib_hdrs}
|
|
DESTINATION include/opencv2/${name}
|
|
diff -up OpenCV-2.2.0/tests/cxts/CMakeLists.txt.libdir OpenCV-2.2.0/tests/cxts/CMakeLists.txt
|
|
--- OpenCV-2.2.0/tests/cxts/CMakeLists.txt.libdir 2010-12-05 04:35:25.000000000 +0100
|
|
+++ OpenCV-2.2.0/tests/cxts/CMakeLists.txt 2011-01-05 18:11:12.535218001 +0100
|
|
@@ -51,7 +51,7 @@ set_target_properties(${the_target} PROP
|
|
# Additional target properties
|
|
set_target_properties(${the_target} PROPERTIES
|
|
DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
|
|
- ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
|
|
+ ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/"
|
|
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
|
|
DEFINE_SYMBOL "CVAPI_EXPORTS"
|
|
)
|