You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
32 lines
1.4 KiB
32 lines
1.4 KiB
14 years ago
|
diff -up OpenCV-2.2.0/CMakeLists.txt.fixpc OpenCV-2.2.0/CMakeLists.txt
|
||
|
|
--- OpenCV-2.2.0/CMakeLists.txt.fixpc 2011-01-06 10:20:33.650218001 +0100
|
||
|
|
+++ OpenCV-2.2.0/CMakeLists.txt 2011-01-06 10:22:10.170217997 +0100
|
||
|
|
@@ -24,8 +24,8 @@ if (NOT CMAKE_INSTALL_PREFIX)
|
||
|
|
endif()
|
||
|
|
endif()
|
||
|
|
|
||
|
|
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
|
||
|
|
-SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
|
||
|
|
+#SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
|
||
|
|
+#SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
|
||
|
|
|
||
|
|
set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Configs" FORCE)
|
||
|
|
set(CMAKE_C_FLAGS_MINSIZEREL "" CACHE INTERNAL "" FORCE)
|
||
|
|
@@ -1166,14 +1166,14 @@ endif()
|
||
|
|
# -------------------------------------------------------------------------------------------
|
||
|
|
set(prefix ${CMAKE_INSTALL_PREFIX})
|
||
|
|
set(exec_prefix "\${prefix}")
|
||
|
|
-set(libdir "\${exec_prefix}/lib")
|
||
|
|
+set(libdir "\${exec_prefix}/lib${LIB_SUFFIX}")
|
||
|
|
set(includedir "\${prefix}/include")
|
||
|
|
set(VERSION ${OPENCV_VERSION})
|
||
|
|
|
||
|
|
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/opencv.pc.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/opencv.pc" @ONLY IMMEDIATE)
|
||
|
|
|
||
|
|
if(UNIX)
|
||
|
|
- install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATION lib/pkgconfig)
|
||
|
|
+ install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
|
||
|
|
endif()
|
||
|
|
|
||
|
|
|