Skip to content

Commit e42a3be

Browse files
committed
Update version number and display it in the about window
1 parent 88d1d3b commit e42a3be

File tree

4 files changed

+23
-16
lines changed

4 files changed

+23
-16
lines changed

CMakeLists.txt

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
cmake_minimum_required(VERSION 3.5)
22

3-
project(openexr-viewer
4-
VERSION 0.5.2
3+
project(openexr-viewer
4+
VERSION 0.6.0
55
DESCRIPTION "Simple Viewer for OpenEXR files with detailed metadata display"
66
HOMEPAGE_URL "https://github.com/afichet/openexr-viewer"
7-
LANGUAGES CXX
7+
LANGUAGES CXX
88
)
99

1010
set(CMAKE_AUTOUIC ON)
@@ -58,6 +58,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake)
5858
# ----------------------------------------------------------------------------
5959
# Source
6060
# ----------------------------------------------------------------------------
61+
message(${CMAKE_PROJECT_VERSION})
62+
63+
configure_file(src/config.h.in config.h)
6164

6265
set(PROJECT_SOURCES
6366
src/main.cpp
@@ -166,7 +169,7 @@ else()
166169
else()
167170
add_executable(openexr-viewer
168171
${PROJECT_SOURCES}
169-
)
172+
)
170173
endif()
171174
endif()
172175

@@ -187,6 +190,7 @@ endif ()
187190

188191
target_include_directories(openexr-viewer PRIVATE src)
189192
target_include_directories(openexr-viewer PRIVATE 3rdparty/data)
193+
target_include_directories(openexr-viewer PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
190194

191195
target_link_libraries(openexr-viewer PRIVATE Qt${QT_VERSION_MAJOR}::Widgets)
192196
target_link_libraries(openexr-viewer PRIVATE Imath::Imath OpenEXR::OpenEXR)
@@ -226,17 +230,17 @@ if (UNIX AND NOT APPLE)
226230

227231
# Application desktop entry
228232
install(
229-
FILES
233+
FILES
230234
deploy/linux/openexr-viewer.desktop
231-
DESTINATION
235+
DESTINATION
232236
share/applications
233237
)
234238

235239
# MIME data
236240
install(
237-
FILES
241+
FILES
238242
deploy/linux/openexr-viewer.xml
239-
DESTINATION
243+
DESTINATION
240244
share/mime/packages
241245
)
242246

@@ -261,9 +265,9 @@ elseif (APPLE)
261265
macdeployqt(openexr-viewer)
262266
elseif (WIN32)
263267
install(
264-
TARGETS
265-
openexr-viewer
266-
DESTINATION
268+
TARGETS
269+
openexr-viewer
270+
DESTINATION
267271
${CMAKE_INSTALL_BINDIR}
268272
)
269273

@@ -278,7 +282,7 @@ elseif (WIN32)
278282
$<TARGET_FILE:OpenEXR::IlmThread>
279283
$<TARGET_FILE:OpenEXR::OpenEXR>
280284
${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} # Windows DLLs
281-
DESTINATION
285+
DESTINATION
282286
${CMAKE_INSTALL_BINDIR}
283287
)
284288

@@ -313,6 +317,7 @@ if(CPACK_GENERATOR MATCHES "NSIS")
313317
set(CPACK_NSIS_MODIFY_PATH OFF)
314318
set(CPACK_NSIS_EXECUTABLES_DIRECTORY ".")
315319
set(CPACK_NSIS_MUI_FINISHPAGE_RUN "openexr-viewer.exe")
320+
set(CPACK_PACKAGE_VENDOR "Lambda")
316321
endif(CPACK_GENERATOR MATCHES "NSIS")
317322

318323
if("${CPACK_GENERATOR}" STREQUAL "PackageMaker")

src/config.h.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#cmakedefine CMAKE_PROJECT_VERSION "@CMAKE_PROJECT_VERSION@"

src/main.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
*/
3232

3333
#include <view/mainwindow.h>
34-
34+
#include <config.h>
3535
#include <QApplication>
3636
#include <QFile>
3737

@@ -53,6 +53,7 @@ int main(int argc, char* argv[])
5353
{
5454
#endif
5555
QApplication a(argc, argv);
56+
a.setApplicationVersion(CMAKE_PROJECT_VERSION);
5657

5758
QFile f(":/dark_flat/theme.css");
5859

src/view/about.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
#include "about.h"
22
#include "ui_about.h"
3+
#include <config.h>
34

45
About::About(QWidget* parent): QDialog(parent), ui(new Ui::About)
56
{
67
ui->setupUi(this);
78

89
ui->textBrowser->setHtml(
910
"<h1>OpenEXR Viewer</h1>"
10-
"<p><em>"
11-
//TODO + tr("Version ") + QApplication::applicationVersion() + "</em></p>"
11+
"<p><em>" + tr("Version ") + QApplication::applicationVersion() + "</em></p>"
1212
+ tr(" \
13-
BSD 3-Clause License \
13+
<p>BSD 3-Clause License \
1414
\
1515
<p>Copyright (c) 2021 - 2022, Alban Fichet <br/> \
1616
All rights reserved. </p>\

0 commit comments

Comments
 (0)