Skip to content

Commit 15494c5

Browse files
authored
Merge pull request #115 from scratchcpp/version_api
Add version API
2 parents 4c2f1aa + 6c8855b commit 15494c5

File tree

3 files changed

+40
-1
lines changed

3 files changed

+40
-1
lines changed

CMakeLists.txt

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.14)
22

3-
project(scratchcpp-render VERSION 1.0.0 LANGUAGES CXX)
3+
project(scratchcpp-render VERSION 0.5.0 LANGUAGES CXX)
44

55
set(CMAKE_INCLUDE_CURRENT_DIR ON)
66
set(CMAKE_AUTOUIC ON)
@@ -17,6 +17,10 @@ qt_standard_project_setup(REQUIRES 6.6)
1717
add_subdirectory(src)
1818

1919
target_compile_definitions(scratchcpp-render PRIVATE SCRATCHCPPRENDER_LIBRARY)
20+
target_compile_definitions(scratchcpp-render PRIVATE SCRATCHCPPRENDER_VERSION="${PROJECT_VERSION}")
21+
target_compile_definitions(scratchcpp-render PRIVATE SCRATCHCPPRENDER_VERSION_MAJOR=${PROJECT_VERSION_MAJOR})
22+
target_compile_definitions(scratchcpp-render PRIVATE SCRATCHCPPRENDER_VERSION_MINOR=${PROJECT_VERSION_MINOR})
23+
target_compile_definitions(scratchcpp-render PRIVATE SCRATCHCPPRENDER_VERSION_PATCH=${PROJECT_VERSION_PATCH})
2024

2125
linkQt(scratchcpp-render)
2226

include/scratchcpp-render/scratchcpp-render.h

+14
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,25 @@
22

33
#pragma once
44

5+
#include <string>
6+
57
/*! \brief The main namespace of the library. */
68
namespace scratchcpprender
79
{
810

911
/*! Initializes the library. Call this from main before constructing your Q(Gui)Application object. */
1012
void init();
1113

14+
/*! Returns the version string of the library. */
15+
const std::string &version();
16+
17+
/*! Returns the major version of the library. */
18+
int majorVersion();
19+
20+
/*! Returns the minor version of the library. */
21+
int minorVersion();
22+
23+
/*! Returns the patch version of the library. */
24+
int patchVersion();
25+
1226
} // namespace scratchcpprender

src/global_functions.cpp

+21
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,24 @@ void scratchcpprender::init()
88
qputenv("QSG_RENDER_LOOP", "basic");
99
QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGL);
1010
}
11+
12+
const std::string &scratchcpprender::version()
13+
{
14+
static const std::string ret = SCRATCHCPPRENDER_VERSION;
15+
return ret;
16+
}
17+
18+
int scratchcpprender::majorVersion()
19+
{
20+
return SCRATCHCPPRENDER_VERSION_MAJOR;
21+
}
22+
23+
int scratchcpprender::minorVersion()
24+
{
25+
return SCRATCHCPPRENDER_VERSION_MINOR;
26+
}
27+
28+
int scratchcpprender::patchVersion()
29+
{
30+
return SCRATCHCPPRENDER_VERSION_PATCH;
31+
}

0 commit comments

Comments
 (0)