[Pkg-running-devel] [openambit] 79/131: Use a more modern install location resolve (GNUInstallDirs)

[Christian Perrier]

This is an automated email from the git hooks/post-receive script.

bubulle pushed a commit to branch master
in repository openambit.

commit 300bff2551aa98612b4ae708fbe33d7d91d3d237
Author: Emil Ljungdahl <emil at kratern.se>
Date:   Wed Jan 29 07:10:28 2014 +0100

    Use a more modern install location resolve (GNUInstallDirs)
---
 src/libambit/CMakeLists.txt                |  7 ++++---
 src/openambit/CMakeLists.txt               | 11 ++++++-----
 src/openambit/deployment/openambit.desktop |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/libambit/CMakeLists.txt b/src/libambit/CMakeLists.txt
index cdf1d24..e1aed28 100644
--- a/src/libambit/CMakeLists.txt
+++ b/src/libambit/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 2.8.5)
 project (LIBAMBIT)
 
 # Where to lookup modules
@@ -17,6 +17,7 @@ ENDIF()
 
 find_package(libusb REQUIRED)
 find_package(UDev REQUIRED)
+include(GNUInstallDirs)
 
 add_library (
   ambit
@@ -43,5 +44,5 @@ include_directories(
   hidapi
 )
 
-install(TARGETS ambit DESTINATION lib)
-install(FILES libambit.h DESTINATION include)
+install(TARGETS ambit DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(FILES libambit.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
diff --git a/src/openambit/CMakeLists.txt b/src/openambit/CMakeLists.txt
index 7e0b48f..1cf0edb 100644
--- a/src/openambit/CMakeLists.txt
+++ b/src/openambit/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required( VERSION 2.6 )
+cmake_minimum_required(VERSION 2.8.5)
 project (OPENAMBIT)
 
 set (OPENAMBIT_VERSION HEAD)
@@ -14,7 +14,8 @@ find_package(UDev REQUIRED)
 find_package(ZLIB REQUIRED)
 find_package(QJSON REQUIRED)
 
-include ( ${QT_USE_FILE} )
+include(${QT_USE_FILE})
+include(GNUInstallDirs)
 
 include_directories (
   ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
@@ -87,13 +88,13 @@ add_executable ( openambit ${openambit_SRCS} ${UIS} ${RSCS} ${TRS} ${MOCS} )
 
 target_link_libraries ( openambit  ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${LIBAMBIT_LIBS} ${UDEV_LIBS} ${ZLIB_LIBRARY} ${QJSON_LIBRARIES} )
 
-install ( TARGETS openambit DESTINATION bin )
+install ( TARGETS openambit DESTINATION ${CMAKE_INSTALL_BINDIR} )
 install ( FILES ${OPENAMBIT_SOURCE_DIR}/deployment/99-suunto-ambit.rules
           DESTINATION ${CMAKE_INSTALL_UDEVRULESDIR}
           COMPONENT system
 )
 install ( FILES ${OPENAMBIT_SOURCE_DIR}/deployment/openambit.desktop
-          DESTINATION share/applications )
+          DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications )
 install ( FILES ${APP_ICON}
-          DESTINATION share/icons/hicolor/64x64/apps
+          DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/64x64/apps
           RENAME openambit.png )
diff --git a/src/openambit/deployment/openambit.desktop b/src/openambit/deployment/openambit.desktop
index c5b92b0..6e7b6de 100644
--- a/src/openambit/deployment/openambit.desktop
+++ b/src/openambit/deployment/openambit.desktop
@@ -6,4 +6,4 @@ Comment=Open source synchronization for Suunto Ambit series
 TryExec=openambit
 Exec=openambit
 Icon=openambit
-Categories=Utility
+Categories=Utility;SyncUtility

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-running/openambit.git