easier to override defaults

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d6f8ade..52d1f2a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,22 +26,22 @@ include_directories(
 )
 add_definitions(${QT_DEFINITIONS})
 
-set(QT_SUFFIX "katie")
-
 include(GenerateExportHeader)
 include(GNUInstallDirs)
-set(LIB_DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/dbusmenu-${QT_SUFFIX}")
+
+set(DBUSMENU_SUFFIX "katie" CACHE STRING "Package suffix")
+set(LIBRARY_DESTINATION "${CMAKE_INSTALL_LIBDIR}" CACHE PATH "Libraries installation path")
+set(INCLUDE_DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/dbusmenu-${DBUSMENU_SUFFIX}" CACHE PATH "Headers installation path")
 
 configure_file(
     dbusmenu-qt.pc.in
-    ${CMAKE_BINARY_DIR}/dbusmenu-${QT_SUFFIX}.pc
+    ${CMAKE_BINARY_DIR}/dbusmenu-${DBUSMENU_SUFFIX}.pc
     @ONLY
 )
 
 install(
-    FILES ${CMAKE_BINARY_DIR}/dbusmenu-${QT_SUFFIX}.pc
-    DESTINATION ${LIB_DESTINATION}/pkgconfig
+    FILES ${CMAKE_BINARY_DIR}/dbusmenu-${DBUSMENU_SUFFIX}.pc
+    DESTINATION ${LIBRARY_DESTINATION}/pkgconfig
 )
 
 add_subdirectory(src)

diff --git a/dbusmenu-qt.pc.in b/dbusmenu-qt.pc.in
index a5e2a25..890be6a 100644 (file)
--- a/dbusmenu-qt.pc.in
+++ b/dbusmenu-qt.pc.in
@@ -1,10 +1,10 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=@CMAKE_INSTALL_PREFIX@
 libdir=@CMAKE_INSTALL_PREFIX@/lib
-includedir=@CMAKE_INSTALL_PREFIX@/include/dbusmenu-@QT_SUFFIX@
+includedir=@CMAKE_INSTALL_PREFIX@/include/dbusmenu-@DBUSMENU_SUFFIX@
 
-Name: libdbusmenu-@QT_SUFFIX@
-Description: Qt implementation of dbusmenu spec
+Name: libdbusmenu-@DBUSMENU_SUFFIX@
+Description: Katie implementation of dbusmenu spec
 Version: @dbusmenu_qt_VERSION@
-Libs: -L${libdir} -ldbusmenu-@QT_SUFFIX@
+Libs: -L${libdir} -ldbusmenu-@DBUSMENU_SUFFIX@
 Cflags: -I${includedir}

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e8d8da7..59e5ec9 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -24,31 +24,31 @@ configure_file(
     ${CMAKE_CURRENT_BINARY_DIR}/dbusmenu_version.h
 )
 
-add_library(dbusmenu-${QT_SUFFIX} SHARED ${dbusmenu_qt_SRCS})
-set_target_properties(dbusmenu-${QT_SUFFIX} PROPERTIES
+add_library(dbusmenu-${DBUSMENU_SUFFIX} SHARED ${dbusmenu_qt_SRCS})
+set_target_properties(dbusmenu-${DBUSMENU_SUFFIX} PROPERTIES
     VERSION ${dbusmenu_qt_VERSION_MAJOR}.${dbusmenu_qt_VERSION_MINOR}
     SOVERSION ${dbusmenu_qt_VERSION_MAJOR}
 )
 
-target_link_libraries(dbusmenu-${QT_SUFFIX}
+target_link_libraries(dbusmenu-${DBUSMENU_SUFFIX}
     ${QT_QTGUI_LIBRARIES}
     ${QT_QTDBUS_LIBRARIES}
     ${QT_QTCORE_LIBRARIES}
 )
 
-generate_export_header(dbusmenu-${QT_SUFFIX}
+generate_export_header(dbusmenu-${DBUSMENU_SUFFIX}
     BASE_NAME dbusmenu
 )
 
 install(
-    TARGETS dbusmenu-${QT_SUFFIX}
-    LIBRARY DESTINATION ${LIB_DESTINATION}
-    ARCHIVE DESTINATION ${LIB_DESTINATION}
+    TARGETS dbusmenu-${DBUSMENU_SUFFIX}
+    LIBRARY DESTINATION ${LIBRARY_DESTINATION}
+    ARCHIVE DESTINATION ${LIBRARY_DESTINATION}
 )
 
 install(
     DIRECTORY .
-    DESTINATION ${INCLUDE_INSTALL_DIR}
+    DESTINATION ${INCLUDE_DESTINATION}
     FILES_MATCHING PATTERN "*.h"
     PATTERN "*_p.h" EXCLUDE
 )
@@ -57,5 +57,5 @@ install(
     FILES
     ${CMAKE_CURRENT_BINARY_DIR}/dbusmenu_version.h
     ${CMAKE_CURRENT_BINARY_DIR}/dbusmenu_export.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}
+    DESTINATION ${INCLUDE_DESTINATION}
 )

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 7a9e90d..ee27e98 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -5,7 +5,7 @@ set(test_LIBRARIES
     ${QT_QTCORE_LIBRARY}
     ${QT_QTDBUS_LIBRARY}
     ${QT_QTTEST_LIBRARY}
-    dbusmenu-${QT_SUFFIX}
+    dbusmenu-${DBUSMENU_SUFFIX}
 )
 
 include_directories(
@@ -27,7 +27,7 @@ target_link_libraries(slowmenu
     ${QT_QTGUI_LIBRARIES}
     ${QT_QTDBUS_LIBRARIES}
     ${QT_QTCORE_LIBRARIES}
-    dbusmenu-${QT_SUFFIX}
+    dbusmenu-${DBUSMENU_SUFFIX}
 )
 
 # dbusmenuexportertest

diff --git a/tests/testapp/CMakeLists.txt b/tests/testapp/CMakeLists.txt
index e1325be..235ede5 100644 (file)
--- a/tests/testapp/CMakeLists.txt
+++ b/tests/testapp/CMakeLists.txt
@@ -14,7 +14,7 @@ include_directories(
 )
 
 target_link_libraries(dbusmenubench-qtapp
-    dbusmenu-${QT_SUFFIX}
+    dbusmenu-${DBUSMENU_SUFFIX}
     ${QT_QTGUI_LIBRARY}
     ${QT_QTCORE_LIBRARY}
     ${QT_QTDBUS_LIBRARY}