42 lines
1.9 KiB
Diff
42 lines
1.9 KiB
Diff
diff -up exiv2-0.25/CMakeLists.txt.cmake_LIB_SUFFIX exiv2-0.25/CMakeLists.txt
|
|
--- exiv2-0.25/CMakeLists.txt.cmake_LIB_SUFFIX 2015-06-15 10:32:21.000000000 -0500
|
|
+++ exiv2-0.25/CMakeLists.txt 2015-06-22 08:48:19.486245765 -0500
|
|
@@ -25,7 +25,7 @@ if( POLICY CMP0042 )
|
|
else()
|
|
SET(CMAKE_MACOSX_RPATH 1)
|
|
endif()
|
|
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
|
|
+#SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
|
|
|
|
|
|
SET( PACKAGE_COPYRIGHT "Andreas Huggel" )
|
|
@@ -156,10 +156,10 @@ INCLUDE( config/CMakeChecks.txt )
|
|
|
|
SET( INSTALL_TARGET_STANDARD_ARGS
|
|
RUNTIME DESTINATION bin
|
|
- LIBRARY DESTINATION lib
|
|
- ARCHIVE DESTINATION lib
|
|
+ LIBRARY DESTINATION lib${LIB_SUFFIX}
|
|
+ ARCHIVE DESTINATION lib${LIB_SUFFIX}
|
|
)
|
|
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
|
|
+#SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
|
|
|
|
##
|
|
# add sources from XMPSDK directory
|
|
diff -up exiv2-0.25/config/CMakeChecks.txt.cmake_LIB_SUFFIX exiv2-0.25/config/CMakeChecks.txt
|
|
--- exiv2-0.25/config/CMakeChecks.txt.cmake_LIB_SUFFIX 2015-04-30 10:31:18.000000000 -0500
|
|
+++ exiv2-0.25/config/CMakeChecks.txt 2015-06-22 08:41:22.913094633 -0500
|
|
@@ -291,9 +291,9 @@ ADD_CUSTOM_TARGET(uninstall "${CMAKE_COM
|
|
|
|
IF( NOT MSVC )
|
|
CONFIGURE_FILE( config/exiv2.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/exiv2.pc @ONLY )
|
|
- INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.pc DESTINATION lib/pkgconfig )
|
|
+ INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig )
|
|
CONFIGURE_FILE( config/exiv2.lsm.cmake ${CMAKE_CURRENT_BINARY_DIR}/exiv2.lsm)
|
|
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.lsm DESTINATION lib/pkgconfig )
|
|
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.lsm DESTINATION lib${LIB_SUFFIX}/pkgconfig )
|
|
ENDIF( NOT MSVC )
|
|
|
|
# ******************************************************************************
|