From 3842958aaccbc155d1706fcc463e54173d8247fe Mon Sep 17 00:00:00 2001 From: Hannes Matuschek Date: Thu, 12 Jul 2018 11:48:10 +0200 Subject: [PATCH] Cleanup. --- CMakeLists.txt | 3 +++ src/CMakeLists.txt | 33 ++++++++++++++++++++------------- text/about.html | 2 +- 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 96ff40b..333c005 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,9 @@ project(kochmorse) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake) include(InstallHeadersWithDirectory) +option(WITH_QSOCHAT "Enabled build of QSO chat commandline test tool." OFF) +option(WITH_TEXTGEN "Enabled build of text generation test tool." OFF) + find_package(Qt5Core REQUIRED) find_package(Qt5Widgets REQUIRED) find_package(Qt5Multimedia REQUIRED) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b8e7554..9ab7409 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -13,20 +13,27 @@ qt5_add_resources(kochmorse_RCC_SOURCES ../resources.qrc) add_executable(kochmorse WIN32 ${kochmorse_SOURCES} ${kochmorse_MOC_SOURCES} ${kochmorse_RCC_SOURCES}) target_link_libraries(kochmorse ${LIBS}) -set(textgen_SOURCES textgen_cli.cc textgen.cc) -set(textgen_MOC_HEADERS textgen.hh) -qt5_wrap_cpp(textgen_MOC_SOURCES ${textgen_MOC_HEADERS}) +install(TARGETS kochmorse DESTINATION bin) -add_executable(textgen WIN32 ${textgen_SOURCES} ${textgen_MOC_SOURCES}) -target_link_libraries(textgen ${LIBS}) -set(qsochat_SOURCES qsochat_cli.cc textgen.cc qsochat.cc) -set(qsochat_MOC_HEADERS textgen.hh qsochat.hh) -qt5_wrap_cpp(qsochat_MOC_SOURCES ${qsochat_MOC_HEADERS}) +if (WITH_TEXTGEN) + set(textgen_SOURCES textgen_cli.cc textgen.cc) + set(textgen_MOC_HEADERS textgen.hh) + qt5_wrap_cpp(textgen_MOC_SOURCES ${textgen_MOC_HEADERS}) -add_executable(qsochat WIN32 ${qsochat_SOURCES} ${qsochat_MOC_SOURCES} ${kochmorse_RCC_SOURCES}) -target_link_libraries(qsochat ${LIBS}) + add_executable(textgen WIN32 ${textgen_SOURCES} ${textgen_MOC_SOURCES}) + target_link_libraries(textgen ${LIBS}) -install(TARGETS kochmorse DESTINATION bin) -install(TARGETS textgen DESTINATION bin) -install(TARGETS qsochat DESTINATION bin) + install(TARGETS textgen DESTINATION bin) +endif (WITH_TEXTGEN) + +if (WITH_QSOCHAT) + set(qsochat_SOURCES qsochat_cli.cc textgen.cc qsochat.cc) + set(qsochat_MOC_HEADERS textgen.hh qsochat.hh) + qt5_wrap_cpp(qsochat_MOC_SOURCES ${qsochat_MOC_HEADERS}) + + add_executable(qsochat WIN32 ${qsochat_SOURCES} ${qsochat_MOC_SOURCES} ${kochmorse_RCC_SOURCES}) + target_link_libraries(qsochat ${LIBS}) + + install(TARGETS qsochat DESTINATION bin) +endif (WITH_QSOCHAT) diff --git a/text/about.html b/text/about.html index c02e9a6..6d8d151 100644 --- a/text/about.html +++ b/text/about.html @@ -3,7 +3,7 @@

Koch Morse

version 3.3.0

-

http://github.com/hmatuschek/KochMorse

+

http://github.com/hmatuschek/kochmorse

Copyright (C) 2007-2018 Hannes Matuschek, DM3MAT, hmatuschek[at]gmail[dot]com