Merge lp:~faure/libdbusmenu-qt/fix_qt5_build into lp:libdbusmenu-qt

[David Faure]

Qt5 build: Port to ECM 0.0.4, and use GNUInstallDirs to autodetect "lib64".

[Albert Astals Cid (aacid)]

I think the ECM dependency is a bit weird given that there hasn't been a release but the dependency is not new, so hardly anything I can push agaist.

Besides that It makes sense.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-05-21 20:16:56 +0000
+++ CMakeLists.txt	2013-01-28 23:23:22 +0000
@@ -48,26 +48,29 @@
 if (Qt5Widgets_FOUND)
    find_package(Qt5DBus REQUIRED)
    include_directories(${Qt5Widgets_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS})
-   find_package(extra-cmake-modules 0.0.2 REQUIRED)
-   set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${EXTRA_CMAKE_MODULES_MODULE_PATH})
+   find_package(ECM 0.0.4 REQUIRED)
+   set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
    find_package(Qt5Transitional REQUIRED Core)
    set(CMAKE_AUTOMOC ON)
    set(CMAKE_AUTOMOC_RELAXED_MODE ON)
+   include(GNUInstallDirs)
+   set(LIB_DESTINATION "${CMAKE_INSTALL_LIBDIR}")
 else()
-find_package(Qt4 REQUIRED)
-include_directories(
+  find_package(Qt4 REQUIRED)
+  include_directories(
     ${QT_INCLUDE_DIR}
     ${QT_QTCORE_INCLUDE_DIR}
     ${QT_QTDBUS_INCLUDE_DIR}
     ${QT_QTGUI_INCLUDE_DIR}
     )
+  set(LIB_DESTINATION "lib${LIB_SUFFIX}" CACHE STRING "Library directory name" FORCE)
 endif()
 
 
 configure_file(dbusmenu-qt.pc.in ${CMAKE_BINARY_DIR}/dbusmenu-qt.pc @ONLY)
 
 install(FILES ${CMAKE_BINARY_DIR}/dbusmenu-qt.pc
-    DESTINATION lib${LIB_SUFFIX}/pkgconfig
+        DESTINATION ${LIB_DESTINATION}/pkgconfig
     )
 
 add_subdirectory(src)
 
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2012-05-21 20:16:56 +0000
+++ src/CMakeLists.txt	2013-01-28 23:23:22 +0000
@@ -75,7 +75,7 @@
     )
 
 install(TARGETS dbusmenu-qt
-    LIBRARY DESTINATION lib${LIB_SUFFIX}
+    LIBRARY DESTINATION ${LIB_DESTINATION}
     RUNTIME DESTINATION bin)
 
 install(DIRECTORY .