Provide version through ecm_setup_version
This commit is contained in:
		
					parent
					
						
							
								3acd280cd7
							
						
					
				
			
			
				commit
				
					
						750b644f8c
					
				
			
		
					 3 changed files with 12 additions and 3 deletions
				
			
		| 
						 | 
					@ -5,6 +5,8 @@ set(danbooru_client_VERSION_MAJOR 0)
 | 
				
			||||||
set(danbooru_client_VERSION_MINOR 2)
 | 
					set(danbooru_client_VERSION_MINOR 2)
 | 
				
			||||||
set(danbooru_client_VERSION_PATCH 0)
 | 
					set(danbooru_client_VERSION_PATCH 0)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					set (danbooru_VERSION ${danbooru_client_VERSION_MAJOR}.${danbooru_client_VERSION_MINOR}.${danbooru_client_VERSION_PATCH})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
find_package (ECM REQUIRED NO_MODULE)
 | 
					find_package (ECM REQUIRED NO_MODULE)
 | 
				
			||||||
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 | 
					set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,9 @@
 | 
				
			||||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
 | 
					set(CMAKE_INCLUDE_CURRENT_DIR ON)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					include(ECMSetupVersion)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					ecm_setup_version(${danbooru_VERSION} VARIABLE_PREFIX DANBOORU_CLIENT VERSION_HEADER ${CMAKE_CURRENT_BINARY_DIR}/danbooru_version.h)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
set(danbooru_client_SRCS
 | 
					set(danbooru_client_SRCS
 | 
				
			||||||
    danbooruconnectwidget.cpp
 | 
					    danbooruconnectwidget.cpp
 | 
				
			||||||
    danboorusearchwidget.cpp
 | 
					    danboorusearchwidget.cpp
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -26,23 +26,26 @@
 | 
				
			||||||
#include <KAboutData>
 | 
					#include <KAboutData>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "mainwindow.h"
 | 
					#include "mainwindow.h"
 | 
				
			||||||
 | 
					#include "danbooru_version.h"
 | 
				
			||||||
 | 
					#include "libdanbooru/libdanbooru_version.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
int main(int argc, char *argv[])
 | 
					int main(int argc, char *argv[])
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    QApplication app(argc, argv);
 | 
					    QApplication app(argc, argv);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    QCoreApplication::setApplicationName(QLatin1String("danbooru-client"));
 | 
					    QCoreApplication::setApplicationName(QLatin1String("danbooru-client"));
 | 
				
			||||||
    QCoreApplication::setApplicationVersion(QLatin1String("0.1alpha"));
 | 
					    QCoreApplication::setApplicationVersion(QLatin1String(DANBOORU_CLIENT_VERSION_STRING));
 | 
				
			||||||
    QCoreApplication::setOrganizationDomain(QLatin1String("kde.org"));
 | 
					    QCoreApplication::setOrganizationDomain(QLatin1String("kde.org"));
 | 
				
			||||||
    QApplication::setApplicationDisplayName(i18n("Danbooru Client"));
 | 
					    QApplication::setApplicationDisplayName(i18n("Danbooru Client"));
 | 
				
			||||||
 | 
					    KLocalizedString::setApplicationDomain("danbooru-client");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    KAboutData aboutData(I18N_NOOP(QLatin1String("danbooru-client")),
 | 
					    KAboutData aboutData(I18N_NOOP(QLatin1String("danbooru-client")),
 | 
				
			||||||
                         i18n("Danbooru Client"),
 | 
					                         i18n("Danbooru Client"),
 | 
				
			||||||
                         QLatin1String("0.1alpha"),
 | 
					                         QLatin1String(DANBOORU_CLIENT_VERSION_STRING),
 | 
				
			||||||
                         i18n("KF5 based Danbooru client"),
 | 
					                         i18n("KF5 based Danbooru client"),
 | 
				
			||||||
                         KAboutLicense::GPL_V3,
 | 
					                         KAboutLicense::GPL_V3,
 | 
				
			||||||
                         i18n("(C) 2015 Luca Beltrame"),
 | 
					                         i18n("(C) 2015 Luca Beltrame"),
 | 
				
			||||||
                         QString(),
 | 
					                         QString("Using libdanbooru version %1").arg(LIBDANBOORU_VERSION_STRING),
 | 
				
			||||||
                         QLatin1String("https://git.dennogumi.org/kde/danbooru-client")
 | 
					                         QLatin1String("https://git.dennogumi.org/kde/danbooru-client")
 | 
				
			||||||
                        );
 | 
					                        );
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue