#1125. Thank You to Michał for reporting and providing the patch.

v0.27.3
Robin Mills 10 years ago
parent 885899ae6b
commit e3e4711190

@ -25,7 +25,7 @@ if( POLICY CMP0042 )
else() else()
SET(CMAKE_MACOSX_RPATH 1) SET(CMAKE_MACOSX_RPATH 1)
endif() endif()
SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") #SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
SET( PACKAGE_COPYRIGHT "Andreas Huggel" ) SET( PACKAGE_COPYRIGHT "Andreas Huggel" )
@ -164,10 +164,10 @@ INCLUDE( config/CMakeChecks.txt )
SET( INSTALL_TARGET_STANDARD_ARGS SET( INSTALL_TARGET_STANDARD_ARGS
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
LIBRARY DESTINATION lib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION lib ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
) )
SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") #SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
## ##
# add sources from XMPSDK directory # add sources from XMPSDK directory

@ -37,6 +37,8 @@ INCLUDE( CheckSymbolExists )
INCLUDE( CheckCSourceCompiles ) INCLUDE( CheckCSourceCompiles )
INCLUDE( CheckCXXSourceCompiles ) INCLUDE( CheckCXXSourceCompiles )
INCLUDE( GNUInstallDirs )
INCLUDE( FindIconv ) INCLUDE( FindIconv )
SET( STDC_HEADERS ON ) SET( STDC_HEADERS ON )
@ -291,9 +293,9 @@ ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_BINARY_DIR}/cmake_uni
IF( NOT MSVC ) IF( NOT MSVC )
CONFIGURE_FILE( config/exiv2.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/exiv2.pc @ONLY ) 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 ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
CONFIGURE_FILE( config/exiv2.lsm.cmake ${CMAKE_CURRENT_BINARY_DIR}/exiv2.lsm) 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 ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
ENDIF( NOT MSVC ) ENDIF( NOT MSVC )
# ****************************************************************************** # ******************************************************************************

@ -321,7 +321,7 @@ INSTALL( FILES ${LIBEXIV2_HDR} DESTINATION include/exiv2 )
# ****************************************************************************** # ******************************************************************************
# Man page # Man page
INSTALL( FILES exiv2.1 DESTINATION man/man1 ) INSTALL( FILES exiv2.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 )
# That's all Folks! # That's all Folks!
## ##

Loading…
Cancel
Save