diff options
| author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-10-16 10:28:00 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-10-16 10:28:26 +0200 |
| commit | c69a09c693fc390f0e85de17ffede0809be89d9e (patch) | |
| tree | 6cac386ef282f6a5a8a0409fc9d4d79675eac505 /src/conf | |
| parent | e6e23a2b707784ae905ebcc23d05d2318718b8bf (diff) | |
| parent | 0db9190dd147196531b16a050fb7a019dd1873af (diff) | |
| download | tmwa-c69a09c693fc390f0e85de17ffede0809be89d9e.tar.gz tmwa-c69a09c693fc390f0e85de17ffede0809be89d9e.tar.bz2 tmwa-c69a09c693fc390f0e85de17ffede0809be89d9e.tar.xz tmwa-c69a09c693fc390f0e85de17ffede0809be89d9e.zip | |
Merge branch 'blaming-the-tools'
Build system overhaul: attoconf from python 2->3, add CMake
Merge request !280
Diffstat (limited to 'src/conf')
| -rw-r--r-- | src/conf/install.hpp.in (renamed from src/conf/install.hpp) | 7 | ||||
| -rw-r--r-- | src/conf/version.hpp.in (renamed from src/conf/version.hpp) | 21 |
2 files changed, 13 insertions, 15 deletions
diff --git a/src/conf/install.hpp b/src/conf/install.hpp.in index 42fd125..e63164a 100644 --- a/src/conf/install.hpp +++ b/src/conf/install.hpp.in @@ -20,10 +20,9 @@ // just mention "fwd.hpp" to make formatter happy -#include "conf-raw/str-PACKAGESYSCONFDIR.h" -#include "conf-raw/str-PACKAGELOCALSTATEDIR.h" -#include "conf-raw/str-PACKAGEDATADIR.h" - +#define PACKAGESYSCONFDIR "@SYSCONFDIR@/tmwa"_s +#define PACKAGELOCALSTATEDIR "@LOCALSTATEDIR@/tmwa"_s +#define PACKAGEDATADIR "@PACKAGEDATADIR@"_s namespace tmwa { diff --git a/src/conf/version.hpp b/src/conf/version.hpp.in index df8a8b6..126fae2 100644 --- a/src/conf/version.hpp +++ b/src/conf/version.hpp.in @@ -20,20 +20,19 @@ // just mention "fwd.hpp" to make formatter happy -#include "conf-raw/str-VERSION_FULL.h" -#include "conf-raw/str-VERSION_HASH.h" +#define VERSION_FULL "@VERSION_FULL@"_s +#define VERSION_HASH "@VERSION_HASH@"_s -#include "conf-raw/int-VERSION_MAJOR.h" -#include "conf-raw/int-VERSION_MINOR.h" -#include "conf-raw/int-VERSION_PATCH.h" -#include "conf-raw/int-VERSION_DEVEL.h" +#define VERSION_MAJOR @PROJECT_VERSION_MAJOR@ +#define VERSION_MINOR @PROJECT_VERSION_MINOR@ +#define VERSION_PATCH @PROJECT_VERSION_PATCH@ +#define VERSION_DEVEL @PROJECT_VERSION_TWEAK@ -#include "conf-raw/str-VENDOR_NAME.h" -#include "conf-raw/int-VENDOR_POINT.h" -#include "conf-raw/str-VENDOR_SOURCE.h" - -#include "conf-raw/str-VERSION_STRING.h" +#define VENDOR_NAME "@VENDOR_NAME@"_s +#define VENDOR_POINT @VENDOR_POINT@ +#define VENDOR_SOURCE "@VENDOR_SOURCE@"_s +#define VERSION_STRING "@VERSION_STRING@"_s namespace tmwa { |