File 0001-Use-GNUInstallDirs-to-determine-install-di... of Package libjreen-qt5

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Use-GNUInstallDirs-to-determine-install-dirs.patch of Package libjreen-qt5 (Revision cb14998d584b1a6ae58d05fbcd8c478f)

Currently displaying revision cb14998d584b1a6ae58d05fbcd8c478f , Show latest

From a0b4631101262887fdd86e913f7c86b86cf4d4f3 Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Thu, 5 Feb 2015 23:35:46 +0100
Subject: [PATCH] Use GNUInstallDirs to determine install dirs

---
 CMakeLists.txt        |  8 +++++---
 src/libjreen.pc.cmake | 10 +++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 472a843..041ea5d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,8 @@ project(Jreen)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
+include( GNUInstallDirs )
+
 set(CMAKE_JREEN_VERSION_MAJOR 1 CACHE INT "Major Jreen version number" FORCE)
 set(CMAKE_JREEN_VERSION_MINOR 2 CACHE INT "Minor Jreen version number" FORCE)
 set(CMAKE_JREEN_VERSION_PATCH 0 CACHE INT "Release Jreen version number" FORCE)
@@ -206,16 +208,16 @@ if(NOT WIN32)
 		${CMAKE_CURRENT_BINARY_DIR}/libjreen${JREEN_SUFFIX}.pc
 	)
 	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libjreen${JREEN_SUFFIX}.pc
-	DESTINATION lib${LIB_SUFFIX}/pkgconfig
+	DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
 )
 endif()
 
 install( TARGETS jreen${JREEN_SUFFIX}
 	RUNTIME DESTINATION bin
 		COMPONENT jreen
-	LIBRARY DESTINATION lib${LIB_SUFFIX}
+	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
 		COMPONENT jreen
-	ARCHIVE DESTINATION lib${LIB_SUFFIX}
+	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 		COMPONENT jreenDevel
 	BUNDLE DESTINATION library
 )
diff --git a/src/libjreen.pc.cmake b/src/libjreen.pc.cmake
index 7996b80..39f9fdb 100644
--- a/src/libjreen.pc.cmake
+++ b/src/libjreen.pc.cmake
@@ -1,12 +1,12 @@
 prefix=${CMAKE_INSTALL_PREFIX}
-exec_prefix=${CMAKE_INSTALL_PREFIX}/bin
-libdir=${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
-includedir=${CMAKE_INSTALL_PREFIX}/include/${JREEN_INCLUDE_PATH}/
+exec_prefix=${CMAKE_INSTALL_FULL_BINDIR}
+libdir=${CMAKE_INSTALL_FULL_LIBDIR}
+includedir=${CMAKE_INSTALL_FULL_INCLUDEDIR}/${JREEN_INCLUDE_PATH}/
 
 Name: libjreen${JREEN_SUFFIX}
 Description: Qt Jabber/XMPP extensible library
 Requires: Qt${JREEN_QT_MIDDLE}Core Qt${JREEN_QT_MIDDLE}Network
 Version: ${CMAKE_JREEN_VERSION_MAJOR}.${CMAKE_JREEN_VERSION_MINOR}.${CMAKE_JREEN_VERSION_PATCH}
-Libs: -L${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} -ljreen${JREEN_SUFFIX}
-Cflags: -I${CMAKE_INSTALL_PREFIX}/include/${JREEN_INCLUDE_PATH}/
+Libs: -L${CMAKE_INSTALL_FULL_LIBDIR} -ljreen${JREEN_SUFFIX}
+Cflags: -I${CMAKE_INSTALL_FULL_INCLUDEDIR}/${JREEN_INCLUDE_PATH}/
 
-- 
2.1.4

Places

File 0001-Use-GNUInstallDirs-to-determine-install-dirs.patch of Package libjreen-qt5 (Revision cb14998d584b1a6ae58d05fbcd8c478f)

Places