From 5e78178fb28b45e8bf2be99f521588e996c4a5c4 Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 8 Dec 2015 08:34:14 +0100 Subject: [PATCH] improved project files --- CMakeLists.txt | 91 +++++++++++++++++++++++++++++++++--------- config.h.in | 9 ----- dbus-soundrecorder.pro | 21 ++++++---- general.pri | 56 +++++++++++++++----------- main.cpp | 2 +- 5 files changed, 118 insertions(+), 61 deletions(-) delete mode 100644 config.h.in diff --git a/CMakeLists.txt b/CMakeLists.txt index 21ff4d6..3fd4436 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,37 +1,77 @@ cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR) +# add project files +set(HEADER_FILES + ffmpeglauncher.h + playerwatcher.h +) +set(SRC_FILES + ffmpeglauncher.cpp + main.cpp + playerwatcher.cpp +) +set(DBUS_FILES + org.freedesktop.DBus.Properties.xml + org.mpris.MediaPlayer2.xml + org.mpris.MediaPlayer2.Player.xml +) + # meta data set(META_PROJECT_NAME dbus-soundrecorder) set(META_APP_NAME "D-Bus Sound Recorder") set(META_APP_AUTHOR "Martchus") set(META_APP_URL "https://github.com/${META_APP_AUTHOR}/${META_PROJECT_NAME}") -set(META APP_DESCRIPTION "Records sound from Pulse Audio with ffmpeg while watching D-Bus to determine tracks and meta information.") +set(META_APP_DESCRIPTION "Records sound from Pulse Audio with ffmpeg while watching D-Bus to determine tracks and meta information.") set(META_VERSION_MAJOR 1) set(META_VERSION_MINOR 1) set(META_VERSION_PATCH 0) -# define project -project(${META_PROJECT_NAME}) - # stringification of meta data set(META_PROJECT_NAME_STR "\"${META_PROJECT_NAME}\"") set(META_APP_NAME_STR "\"${META_APP_NAME}\"") set(META_APP_AUTHOR_STR "\"${META_APP_AUTHOR}\"") set(META_APP_URL_STR "\"${META_APP_URL}\"") -set(APP_DESCRIPTION_STR "\"${APP_DESCRIPTION}\"") -set(META_APP_VERSION_STR "\"${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH}\"") +set(META_APP_DESCRIPTION_STR "\"${META_APP_DESCRIPTION}\"") +set(META_APP_VERSION ${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH}) +set(META_APP_VERSION_STR "\"${META_APP_VERSION}\"") + +# define project +project(${META_PROJECT_NAME}) # add configuration header -configure_file ( - "${PROJECT_SOURCE_DIR}/config.h.in" - "${PROJECT_BINARY_DIR}/config.h" +configure_file( + "${PROJECT_SOURCE_DIR}/resources/config.h.in" + "${PROJECT_BINARY_DIR}/resources/config.h" ) include_directories("${PROJECT_BINARY_DIR}") -# add source and header files -file(GLOB_RECURSE SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cpp") -file(GLOB_RECURSE HEADER_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.h") -file(GLOB_RECURSE DBUS_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "org.*.xml") +# add windows resource file +if(MINGW) + # creation windows icon from png with ffmpeg if available + find_program(FFMPEG_BIN ffmpeg avconv) + if(FFMPEG_BIN) + set(PNG_ICON_PATH "${PROJECT_SOURCE_DIR}/resources/icons/hicolor/128x128/apps/${META_PROJECT_NAME}.png") + if(EXISTS ${PNG_ICON_PATH}) + set(WINDOWS_ICON_PATH "${PROJECT_BINARY_DIR}/${META_PROJECT_NAME}.ico") + set(WINDOWS_ICON_RC_ENTRY "IDI_ICON1 ICON DISCARDABLE \"${WINDOWS_ICON_PATH}\"") + add_custom_command( + OUTPUT "${WINDOWS_ICON_PATH}" + COMMAND ${FFMPEG_BIN} -y -i "${PNG_ICON_PATH}" -vf crop=iw-20:ih-20:10:10,scale=64:64 "${WINDOWS_ICON_PATH}" + ) + endif() + endif(FFMPEG_BIN) + # create windows rc file from template + set(WINDOWS_EXT "exe") + configure_file( + "${PROJECT_SOURCE_DIR}/resources/windows.rc.in" + "${PROJECT_BINARY_DIR}/resources/windows.rc" + ) + # set windres as resource compiler + set(RES_FILES "${PROJECT_BINARY_DIR}/resources/windows.rc") + set(CMAKE_RC_COMPILER_INIT windres) + set(CMAKE_RC_COMPILE_OBJECT " -O coff -i -o ") + enable_language(RC) +endif(MINGW) # check required Qt 5 modules find_package(Qt5Core REQUIRED) @@ -46,15 +86,28 @@ qt5_add_dbus_interfaces(SRC_FILES ${DBUS_FILES}) add_definitions(-DCMAKE_BUILD) # executable and linking -add_executable(${META_PROJECT_NAME} ${HEADER_FILES} ${SRC_FILES}) +add_executable(${META_PROJECT_NAME} ${HEADER_FILES} ${SRC_FILES} ${RES_FILES} ${WINDOWS_ICON_PATH}) target_link_libraries(${META_PROJECT_NAME} c++utilities Qt5::Core Qt5::DBus) - -# enable C++11 -set_property(TARGET ${META_PROJECT_NAME} PROPERTY CXX_STANDARD 11) +set_target_properties(${META_PROJECT_NAME} PROPERTIES + CXX_STANDARD 11 +) # add install target install(TARGETS ${META_PROJECT_NAME} RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib + COMPONENT binary +) +add_custom_target(install-binary + DEPENDS ${META_PROJECT_NAME} + COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=binary -P "${CMAKE_BINARY_DIR}/cmake_install.cmake" +) +add_custom_target(install-mingw-w64 + DEPENDS install-binary +) +add_custom_target(install-binary-strip + DEPENDS ${META_PROJECT_NAME} + COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_DO_STRIP=1 -DCMAKE_INSTALL_COMPONENT=binary -P "${CMAKE_BINARY_DIR}/cmake_install.cmake" +) +add_custom_target(install-mingw-w64-strip + DEPENDS install-binary-strip ) diff --git a/config.h.in b/config.h.in deleted file mode 100644 index 2f9ca46..0000000 --- a/config.h.in +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef APP_METADATA_AVAIL -#define APP_METADATA_AVAIL -#define PROJECT_NAME @META_PROJECT_NAME_STR@ -#define APP_NAME @META_APP_NAME_STR@ -#define APP_VERSION @META_APP_VERSION_STR@ -#define APP_AUTHOR @META_APP_AUTHOR_STR@ -#define APP_URL @META_APP_URL_STR@ -#define APP_DESCRIPTION @META_APP_DESCRIPTION_STR@ -#endif // APP_METADATA_AVAIL diff --git a/dbus-soundrecorder.pro b/dbus-soundrecorder.pro index cc7589f..c15a47b 100644 --- a/dbus-soundrecorder.pro +++ b/dbus-soundrecorder.pro @@ -1,3 +1,4 @@ +# meta data projectname = dbus-soundrecorder appname = "D-Bus Sound Recorder" appauthor = Martchus @@ -12,28 +13,32 @@ VERSION = 1.1.0 } } +# basic configuration: console application TEMPLATE = app - CONFIG += console - QT += core dbus -SOURCES += main.cpp \ - playerwatcher.cpp \ - ffmpeglauncher.cpp - +# add project files HEADERS += \ playerwatcher.h \ ffmpeglauncher.h +SOURCES += \ + main.cpp \ + playerwatcher.cpp \ + ffmpeglauncher.cpp + DBUS_INTERFACES += \ org.freedesktop.DBus.Properties.xml \ org.mpris.MediaPlayer2.xml \ org.mpris.MediaPlayer2.Player.xml -DISTFILES += \ +OTHER_FILES += \ README.md \ - LICENSE + LICENSE \ + CMakeLists.txt \ + resources/config.h.in \ + resources/windows.rc.in # libs and includepath CONFIG(debug, debug|release) { diff --git a/general.pri b/general.pri index 6e654cd..7072941 100644 --- a/general.pri +++ b/general.pri @@ -1,28 +1,12 @@ -#dirs +# specify build directories for moc, object and rcc files MOC_DIR = ./moc OBJECTS_DIR = ./obj RCC_DIR = ./res -# compiler flags + +# compiler flags: enable C++11 QMAKE_CXXFLAGS += -std=c++11 QMAKE_LFLAGS += -std=c++11 -# prefix -targetprefix = $$(TARGET_PREFIX) -message("Using target prefix \"$${targetprefix}\".") -# print install root -message("Using install root \"$$(INSTALL_ROOT)\".") -# target -CONFIG(debug, debug|release) { - TARGET = $${targetprefix}$${projectname}d -} else { - TARGET = $${targetprefix}$${projectname} -} -# add defines -DEFINES += "APP_METADATA_AVAIL" -DEFINES += "'PROJECT_NAME=\"$${projectname}\"'" -DEFINES += "'APP_NAME=\"$${appname}\"'" -DEFINES += "'APP_AUTHOR=\"$${appauthor}\"'" -DEFINES += "'APP_URL=\"$${appurl}\"'" -DEFINES += "'APP_VERSION=\"$${VERSION}\"'" + # variables to check target architecture win32-g++:QMAKE_TARGET.arch = $$QMAKE_HOST.arch win32-g++-32:QMAKE_TARGET.arch = x86 @@ -30,7 +14,30 @@ win32-g++-64:QMAKE_TARGET.arch = x86_64 linux-g++:QMAKE_TARGET.arch = $$QMAKE_HOST.arch linux-g++-32:QMAKE_TARGET.arch = x86 linux-g++-64:QMAKE_TARGET.arch = x86_64 -# configuration + +# determine and print target prefix +targetprefix = $$(TARGET_PREFIX) +message("Using target prefix \"$${targetprefix}\".") + +# print install root +message("Using install root \"$$(INSTALL_ROOT)\".") + +# set target +CONFIG(debug, debug|release) { + TARGET = $${targetprefix}$${projectname}d +} else { + TARGET = $${targetprefix}$${projectname} +} + +# add defines for meta data +DEFINES += "APP_METADATA_AVAIL" +DEFINES += "'PROJECT_NAME=\"$${projectname}\"'" +DEFINES += "'APP_NAME=\"$${appname}\"'" +DEFINES += "'APP_AUTHOR=\"$${appauthor}\"'" +DEFINES += "'APP_URL=\"$${appurl}\"'" +DEFINES += "'APP_VERSION=\"$${VERSION}\"'" + +# configure Qt modules and defines mobile { DEFINES += CONFIG_MOBILE } else:desktop { @@ -61,7 +68,7 @@ no-gui { } guiqtquick { message("Configured for Qt Quick GUI support.") - greaterThan(QT_MAJOR_VERSION, 4): QT += quick + QT += quick CONFIG(debug, debug|release) { CONFIG += qml_debug } @@ -69,11 +76,12 @@ guiqtquick { } guiqtwidgets { message("Configured for Qt widgets GUI support.") - greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + QT += widgets DEFINES += GUI_QTWIDGETS DEFINES += MODEL_UNDO_SUPPORT } -# Windows stuff: configuration for cross compliation with mingw-w64 + +# configuration for cross compliation with mingw-w64 win32 { QMAKE_TARGET_PRODUCT = "$${appname}" QMAKE_TARGET_COPYRIGHT = "by $${appauthor}" diff --git a/main.cpp b/main.cpp index ee8ee22..82c1a64 100644 --- a/main.cpp +++ b/main.cpp @@ -3,7 +3,7 @@ // include configuration from separate header file when building with CMake #ifndef APP_METADATA_AVAIL -#include "config.h" +#include "resources/config.h" #endif #include