Add build type to about; fix INSTALL ordering; typo

LMMS · Nov 2, 2019 · 94f742c · 94f742c
1 parent 6a49f11
commit 94f742c
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/cmake/branding/CMakeLists.txt b/cmake/branding/CMakeLists.txt
@@ -14,7 +14,7 @@ IF (ImageMagick_FOUND AND RSVG_FOUND)
 	IF(NOT LMMS_RELEASE_TYPE_CACHE STREQUAL "${LMMS_RELEASE_TYPE}")
 		SET(LMMS_RELEASE_TYPE_CACHE "${LMMS_RELEASE_TYPE}" CACHE STRING "" FORCE)
 	ELSE()
-		MESSAGE(INFO "Skipping rebranding, LMMS_RELEASE_TYPE hasn't changed")
+		MESSAGE(STATUS "Skipping rebranding, LMMS_RELEASE_TYPE hasn't changed")
 		RETURN()
 	ENDIF()
 ELSE()
@@ -148,11 +148,6 @@ FOREACH(size ${ICON_SIZES})
 	ENDFOREACH()
 ENDFOREACH()
 
-# Stage files for install
-INSTALL(FILES "png/splash.png" DESTINATION "${LMMS_DATA_DIR}/themes/default/splash.png")
-INSTALL(FILES "png/icon_32x32.png" DESTINATION "${LMMS_DATA_DIR}/themes/default/icon_small.png")
-INSTALL(FILES "png/icon_128x128.png" DESTINATION "${LMMS_DATA_DIR}/themes/default/icon.png")
-
 # Handle files needed at packaging time (.ico, .icns, etc)
 MESSAGE(STATUS "  Branding ${ICON_FORMAT} file(s)...")
 FILE(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${ICON_DEST}")

diff --git a/cmake/modules/VersionInfo.cmake b/cmake/modules/VersionInfo.cmake
@@ -14,7 +14,7 @@ IF(GIT_FOUND AND NOT FORCE_VERSION)
 		LIST(GET TAG_LIST 0 FORCE_VERSION)
 		STRING(REPLACE "v" "" FORCE_VERSION "${FORCE_VERSION}")
 	ENDIF()
-	IF(TAG_LIST_LENGTH LESSL 2)
+	IF(TAG_LIST_LENGTH LESS 2)
 		SET(LMMS_RELEASE_TYPE "Stable")
 	ELSEIF(TAG_LIST_LENGTH EQUAL 2)
 		SET(LMMS_RELEASE_TYPE "Beta")

diff --git a/data/themes/CMakeLists.txt b/data/themes/CMakeLists.txt
@@ -2,3 +2,7 @@ INCLUDE(InstallHelpers)
 
 INSTALL_DATA_SUBDIRS("themes" "*.png;*.css")
 
+# Handle custom branding
+INSTALL(FILES "${CMAKE_BINARY_DIR}/cmake/branding/png/splash.png" DESTINATION "${LMMS_DATA_DIR}/themes/default" OPTIONAL)
+INSTALL(FILES "${CMAKE_BINARY_DIR}/cmake/branding/png/icon_32x32.png" DESTINATION "${LMMS_DATA_DIR}/themes/default" RENAME icon_small.png OPTIONAL)
+INSTALL(FILES "${CMAKE_BINARY_DIR}/cmake/branding/png/icon_128x128.png" DESTINATION "${LMMS_DATA_DIR}/themes/default" RENAME icon.png OPTIONAL)
diff --git a/src/gui/AboutDialog.cpp b/src/gui/AboutDialog.cpp
@@ -41,6 +41,7 @@ AboutDialog::AboutDialog(QWidget* parent) :
 
 	versionLabel->setText( versionLabel->text().
 					arg( LMMS_VERSION ).
+					arg( LMMS_RELEASE_TYPE ).
 					arg( PLATFORM ).
 					arg( MACHINE ).
 					arg( QT_VERSION_STR ).

diff --git a/src/gui/dialogs/about_dialog.ui b/src/gui/dialogs/about_dialog.ui
@@ -47,7 +47,7 @@
        <item>
         <widget class="QLabel" name="versionLabel">
          <property name="text">
-          <string>Version %1 (%2/%3, Qt %4, %5).</string>
+          <string>Version %1 "%2" (%3/%4, Qt %5, %6).</string>
          </property>
         </widget>
        </item>

diff --git a/src/lmmsversion.h.in b/src/lmmsversion.h.in
@@ -1,2 +1,3 @@
 #define LMMS_VERSION "@VERSION@"
 #define LMMS_PROJECT_COPYRIGHT "@PROJECT_COPYRIGHT@"
+#define LMMS_RELEASE_TYPE "@LMMS_RELEASE_TYPE@"