Skip to content

Commit 6151ccd

Browse files
committed
Move version to header
1 parent f961148 commit 6151ccd

4 files changed

Lines changed: 24 additions & 10 deletions

File tree

CMakeLists.txt

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@ cmake_minimum_required(VERSION 3.31)
22
cmake_policy(SET CMP0048 NEW)
33
cmake_policy(SET CMP0091 NEW)
44

5-
set(DJV_VERSION_MAJOR "3")
6-
set(DJV_VERSION_MINOR "5")
7-
set(DJV_VERSION_PATCH "0")
8-
set(DJV_VERSION_DEV "-dev")
9-
set(DJV_VERSION_FULL "${DJV_VERSION_MAJOR}.${DJV_VERSION_MINOR}.${DJV_VERSION_PATCH}${DJV_VERSION_DEV}")
10-
add_definitions(-DDJV_VERSION_MAJOR=${DJV_VERSION_MAJOR})
11-
add_definitions(-DDJV_VERSION_MINOR=${DJV_VERSION_MINOR})
12-
add_definitions(-DDJV_VERSION_PATCH=${DJV_VERSION_PATCH})
13-
add_definitions(-DDJV_VERSION_DEV="${DJV_VERSION_DEV}")
14-
add_definitions(-DDJV_VERSION_FULL="${DJV_VERSION_FULL}")
5+
file(READ "lib/djv/Core/Version.h" VERSION_H)
6+
string(REGEX MATCH "VERSION_MAJOR ([0-9]*)" _ ${VERSION_H})
7+
set(DJV_VERSION_MAJOR ${CMAKE_MATCH_1})
8+
string(REGEX MATCH "VERSION_MINOR ([0-9]*)" _ ${VERSION_H})
9+
set(DJV_VERSION_MINOR ${CMAKE_MATCH_1})
10+
string(REGEX MATCH "VERSION_PATCH ([0-9]*)" _ ${VERSION_H})
11+
set(DJV_VERSION_PATCH ${CMAKE_MATCH_1})
12+
string(REGEX MATCH "VERSION_DEV \"([0-9a-z\.\-]*)\"" _ ${VERSION_H})
13+
set(DJV_VERSION_DEV ${CMAKE_MATCH_1})
14+
string(REGEX MATCH "VERSION_FULL \"([0-9a-z\.\-]*)\"" _ ${VERSION_H})
15+
set(DJV_VERSION_FULL ${CMAKE_MATCH_1})
1516

1617
project(
1718
DJV

bin/djv/main.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Copyright Contributors to the DJV project.
33

44
#include <djv/App/App.h>
5+
#include <djv/Core/Version.h>
56

67
#include <tlRender/UI/Init.h>
78
#include <tlRender/Device/Init.h>

lib/djv/Core/Version.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// SPDX-License-Identifier: BSD-3-Clause
2+
// Copyright Contributors to the DJV project.
3+
4+
#pragma once
5+
6+
#define DJV_VERSION_MAJOR 3
7+
#define DJV_VERSION_MINOR 5
8+
#define DJV_VERSION_PATCH 0
9+
#define DJV_VERSION_DEV "-dev"
10+
#define DJV_VERSION_FULL "3.5.0-dev"

lib/djv/Models/AppInfoModel.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
#include <djv/Models/AppInfoModel.h>
55

6+
#include <djv/Core/Version.h>
7+
68
namespace djv
79
{
810
namespace models

0 commit comments

Comments
 (0)