From 48afdb4eef04ba7c141e5f94d225385491cddd37 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sat, 21 Aug 2010 18:29:47 -0500 Subject: [PATCH] [master] Update CMakelists.txt to use CMAKE_INSTALL_LIBDIR variable; useful for installing libpng in /usr/lib64 (FundaWang). --- ANNOUNCE | 6 ++++-- CHANGES | 4 +++- CMakeLists.txt | 17 ++++++++++------- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 6627ac06c..c3919be75 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.4.4beta07 - August 17, 2010 +Libpng 1.4.4beta07 - August 21, 2010 This is not intended to be a public release. It will be replaced within a few weeks by a public version or by another test version. @@ -58,9 +58,11 @@ version 1.4.4beta06 [August 11, 2010] Don't try to use version-script with cygwin/mingw. Revised contrib/gregbook to work under cygwin/mingw. -version 1.4.4beta07 [August 17, 2010] +version 1.4.4beta07 [August 21, 2010] Updated prebuilt aclocal.m4 and ltmain.sh Add .dll.a to the list of extensions to be symlinked by Makefile.am (Yaakov) + Update CMakelists.txt to use CMAKE_INSTALL_LIBDIR variable; useful for + installing libpng in /usr/lib64 (FundaWang). Send comments/corrections/commendations to glennrp at users.sourceforge.net or to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 91a713ad4..1cdc1269c 100644 --- a/CHANGES +++ b/CHANGES @@ -2642,9 +2642,11 @@ version 1.4.4beta06 [August 11, 2010] Don't try to use version-script with cygwin/mingw. Revised contrib/gregbook to work under cygwin/mingw. -version 1.4.4beta07 [August 17, 2010] +version 1.4.4beta07 [August 21, 2010] Updated prebuilt aclocal.m4 and ltmain.sh Add .dll.a to the list of extensions to be symlinked by Makefile.am (Yaakov) + Update CMakelists.txt to use CMAKE_INSTALL_LIBDIR variable; useful for + installing libpng in /usr/lib64 (FundaWang). Send comments/corrections/commendations to glennrp at users.sourceforge.net or to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index c0535bee6..627eae0f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -196,9 +196,12 @@ endif() # CREATE PKGCONFIG FILES # we use the same files like ./configure, so we have to set its vars +if(NOT DEFINED CMAKE_INSTALL_LIBDIR) + set(CMAKE_INSTALL_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib) +endif(NOT DEFINED CMAKE_INSTALL_LIBDIR) set(prefix ${CMAKE_INSTALL_PREFIX}) set(exec_prefix ${CMAKE_INSTALL_PREFIX}) -set(libdir ${CMAKE_INSTALL_PREFIX}/lib) +set(libdir ${CMAKE_INSTALL_LIBDIR}) set(includedir ${CMAKE_INSTALL_PREFIX}/include) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng.pc.in @@ -232,13 +235,13 @@ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL ) if(PNG_SHARED) install(TARGETS ${PNG_LIB_NAME} RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() if(PNG_STATIC) install(TARGETS ${PNG_LIB_NAME_STATIC} - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() endif() @@ -257,11 +260,11 @@ if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL ) install(FILES png.5 DESTINATION man/man5) # Install pkg-config files install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng.pc - DESTINATION lib/pkgconfig) + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng-config DESTINATION bin) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc - DESTINATION lib/pkgconfig) + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config DESTINATION bin) endif()