[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [libnm-qt] /: Drop unneccessary dependency on extra-cmake-modules and use GNUInstallDirs
From:       Lamarque V. Souza <lamarque () kde ! org>
Date:       2014-03-05 13:35:04
Message-ID: E1WLByS-0002Zi-RA () scm ! kde ! org
[Download RAW message or body]

Git commit 68fa427587a38805f27e28cd9b6de1b248b18fe5 by Lamarque V. Souza, on behalf \
of Alex Richardson. Committed on 05/03/2014 at 13:23.
Pushed by lvsouza into branch 'master'.

Drop unneccessary dependency on extra-cmake-modules and use GNUInstallDirs

This means there is no longer a need for passing -DLIB_SUFFIX=64 on e.g.
openSuSE, since CMake will detect the correct install directory for most
distributions. If for some reason CMake doesn't detect the correct
directory it can be overriden using e.g. -DCMAKE_INSTALL_LIBDIR=lib32

REVIEW: 116098

M  +6    -9    CMakeLists.txt
M  +1    -1    NetworkManagerQt.pc.cmake
M  +1    -1    include/CMakeLists.txt
M  +1    -1    include/settings/CMakeLists.txt

http://commits.kde.org/libnm-qt/68fa427587a38805f27e28cd9b6de1b248b18fe5

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 88ace90..2c0cd93 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,13 +2,10 @@ cmake_minimum_required(VERSION 2.8)
 
 project(NetworkManagerQt)
 
+include(GNUInstallDirs)
+
 set(VERSION 0.9.9.1)
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_MODULE_PATH})
-set(LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
-set(LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING
-    "Library directory name")
-set(PKGCONFIG_INSTALL_PREFIX "${LIB_DESTINATION}/pkgconfig/" CACHE STRING
-    "Base directory for pkgconfig files")
 
 if (NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Debug)
@@ -262,9 +259,9 @@ else()
 target_link_libraries(NetworkManagerQt ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} \
${QT_QTNETWORK_LIBRARY})  endif()
 
-install(TARGETS NetworkManagerQt DESTINATION ${LIB_DESTINATION})
-install(FILES ${NetworkManagerQt_HEADERS} DESTINATION include/NetworkManagerQt \
                COMPONENT Devel)
-install(FILES ${CONNECTIONS_SETTINGS_HEADERS} DESTINATION \
include/NetworkManagerQt/settings COMPONENT Devel) +install(TARGETS NetworkManagerQt \
DESTINATION ${CMAKE_INSTALL_LIBDIR}) +install(FILES ${NetworkManagerQt_HEADERS} \
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/NetworkManagerQt COMPONENT Devel) \
+install(FILES ${CONNECTIONS_SETTINGS_HEADERS} DESTINATION \
${CMAKE_INSTALL_INCLUDEDIR}/NetworkManagerQt/settings COMPONENT Devel)  
 set_property(TARGET NetworkManagerQt PROPERTY COMPILE_DEFINITIONS \
MAKE_NETWORKMANAGERQT_LIB)  set_property(TARGET NetworkManagerQt PROPERTY VERSION \
${VERSION}) @@ -272,7 +269,7 @@ set_property(TARGET NetworkManagerQt PROPERTY \
SOVERSION 0)  
 message(STATUS "Writing pkg-config file...")
 configure_file(${CMAKE_SOURCE_DIR}/NetworkManagerQt.pc.cmake \
                ${CMAKE_BINARY_DIR}/NetworkManagerQt.pc @ONLY)
-install(FILES ${CMAKE_BINARY_DIR}/NetworkManagerQt.pc DESTINATION \
"${PKGCONFIG_INSTALL_PREFIX}") +install(FILES ${CMAKE_BINARY_DIR}/NetworkManagerQt.pc \
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)  
 add_subdirectory(include)
 
diff --git a/NetworkManagerQt.pc.cmake b/NetworkManagerQt.pc.cmake
index e58a1ac..8be93bd 100644
--- a/NetworkManagerQt.pc.cmake
+++ b/NetworkManagerQt.pc.cmake
@@ -18,7 +18,7 @@
 
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=@LIB_DESTINATION@
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
 includedir=${prefix}/include
 
 Name: NetworkManagerQt
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 499b2e6..ed328bb 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -38,6 +38,6 @@ set(NetworkManagerQt_CAMEL_HEADERS
 install(FILES
    ${NetworkManagerQt_CAMEL_HEADERS}
    DESTINATION
-   include/NetworkManagerQt COMPONENT Devel)
+   ${CMAKE_INSTALL_INCLUDEDIR}/NetworkManagerQt COMPONENT Devel)
 
 add_subdirectory(settings)
diff --git a/include/settings/CMakeLists.txt b/include/settings/CMakeLists.txt
index 0d2b0b9..71f23b9 100644
--- a/include/settings/CMakeLists.txt
+++ b/include/settings/CMakeLists.txt
@@ -28,4 +28,4 @@ set(NetworkManagerQt_settings_CAMEL_HEADERS
 install(FILES
    ${NetworkManagerQt_settings_CAMEL_HEADERS}
    DESTINATION
-   include/NetworkManagerQt COMPONENT Devel)
+   ${CMAKE_INSTALL_INCLUDEDIR}/NetworkManagerQt COMPONENT Devel)


[prev in list] [next in list] [prev in thread] [next in thread]