From d3110f59a09f7e4c94cb8476faa87e9482239de3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Oliver=20Gro=C3=9F?= Date: Tue, 2 Feb 2010 12:54:46 +0100 Subject: [PATCH] ported to cmake --- CMakeLists.txt | 24 ++++++++++++++++++++++++ debian/rules | 5 +---- qbat.pro | 40 ---------------------------------------- settings.h | 2 +- 4 files changed, 26 insertions(+), 45 deletions(-) create mode 100644 CMakeLists.txt delete mode 100644 qbat.pro diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..fc7d068 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,24 @@ +project(qbat) +cmake_minimum_required(VERSION 2.6) +find_package(Qt4 COMPONENTS QtCore QtGui REQUIRED) + +include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}) + +set(qbat_INSTALL_SHARE_PREFIX ${CMAKE_INSTALL_PREFIX}/share/qbat) +set(qbat_FORMS settingsdialog.ui) +set(qbat_SOURCES_H constants.h batteryicon.h common.h powermanager.h settings.h qtimermessagebox.h) +set(qbat_TRANSLATIONS qbat_de.ts) +set(qbat_SOURCES_CPP main.cpp batteryicon.cpp powermanager.cpp common.cpp settings.cpp qtimermessagebox.cpp) + +qt4_wrap_ui(qbat_FORMS_H ${qbat_FORMS}) +qt4_wrap_cpp(qbat_SOURCES_MOC ${qbat_SOURCES_H}) +qt4_add_translation(qbat_TRANSLATIONS_QM ${qbat_TRANSLATIONS}) + +add_executable(qbat ${qbat_SOURCES_CPP} ${qbat_SOURCES_MOC} ${qbat_SOURCES_H} ${qbat_FORMS_H} ${qbat_TRANSLATIONS_QM}) +target_link_libraries(qbat ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) + +file(GLOB qbat_RES_ICONS res/*.png) + +install(TARGETS qbat DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) +install(FILES ${qbat_TRANSLATIONS_QM} DESTINATION ${qbat_INSTALL_SHARE_PREFIX}/lang) +install(FILES ${qbat_RES_ICONS} DESTINATION ${qbat_INSTALL_SHARE_PREFIX}/icons) diff --git a/debian/rules b/debian/rules index afaa128..b282347 100755 --- a/debian/rules +++ b/debian/rules @@ -1,12 +1,9 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/qmake.mk +include /usr/share/cdbs/1/class/cmake.mk $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: $(if $(wildcard debian/$(cdbs_curpkg)/usr/share/applications/*), dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS)) -QMAKE=qmake-qt4 'CONFIG+=release' 'DEFINES+=QT_NO_DEBUG_OUTPUT' - DEB_INSTALL_MANPAGES_qbat=res/qbat.1 - diff --git a/qbat.pro b/qbat.pro deleted file mode 100644 index 95f525f..0000000 --- a/qbat.pro +++ /dev/null @@ -1,40 +0,0 @@ -TEMPLATE = app -CONFIG += qt - -CODECFORSRC = UTF-8 -CODECFORTR = ISO-8859-1 - -OBJECTS_DIR = build/ -MOC_DIR = build/ -UI_DIR = ui/ - -TRANSLATIONS = qbat_de.ts - -SOURCES += main.cpp \ - batteryicon.cpp \ - powermanager.cpp \ - common.cpp \ - settings.cpp \ - qtimermessagebox.cpp -DESTDIR = . - -target.path = /usr/bin -iconstarget.path = /usr/share/qbat/icons -iconstarget.files = res/qbat*.svg res/qbat.png -langtarget.path = /usr/share/qbat/lang -langtarget.files = qbat_*.qm -shortcuttarget.path = /usr/share/applications -shortcuttarget.files = qbat.desktop - -INSTALLS += target iconstarget langtarget shortcuttarget - -HEADERS += constants.h \ -batteryicon.h \ -common.h \ -powermanager.h \ - settings.h \ - qtimermessagebox.h -TARGET = qbat - -FORMS += settingsdialog.ui - diff --git a/settings.h b/settings.h index 250baf0..f7d9458 100644 --- a/settings.h +++ b/settings.h @@ -9,7 +9,7 @@ #define QBAT_SETTINGS_H #include -#include "ui/ui_settingsdialog.h" +#include "ui_settingsdialog.h" #include "common.h" namespace qbat { -- 2.11.4.GIT