From febaf63d22d9a44b864df9b3871c7577c5dc7a52 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Tue, 7 Feb 2017 18:52:00 -0500 Subject: [PATCH] Merge cmakelists with master changes --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c0e52cf..d1526c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,7 +45,7 @@ IF(CUSTOM_BUILD) ) ENDIF() ELSE() - SET (CUBICSDR_BUILD_TITLE "CubicSDR v${CUBICSDR_VERSION} by Charles J. Cliffe (@ccliffe) :: www.cubicsdr.com") + SET (CUBICSDR_BUILD_TITLE "CubicSDR v${CUBICSDR_VERSION} :: www.cubicsdr.com") # bundle flags SET (CUBICSDR_INSTALL_NAME "CubicSDR") SET (CUBICSDR_INSTALL_TITLE "CubicSDR ${CUBICSDR_VERSION} Installer") @@ -376,6 +376,8 @@ SET (cubicsdr_sources src/forms/Bookmark/BookmarkView.cpp src/forms/Dialog/ActionDialogBase.cpp src/forms/Dialog/ActionDialog.cpp + src/forms/Dialog/AboutDialogBase.cpp + src/forms/Dialog/AboutDialog.cpp external/lodepng/lodepng.cpp external/tinyxml/tinyxml.cpp external/tinyxml/tinystr.cpp @@ -481,6 +483,8 @@ SET (cubicsdr_headers src/forms/Bookmark/BookmarkView.h src/forms/Dialog/ActionDialogBase.h src/forms/Dialog/ActionDialog.h + src/forms/Dialog/AboutDialogBase.h + src/forms/Dialog/AboutDialog.h external/lodepng/lodepng.h external/tinyxml/tinyxml.h external/tinyxml/tinystr.h