Skip to content
Snippets Groups Projects

Release 0.1

Merged Release 0.1
dev into main
Merged Timm Fitschen requested to merge dev into main
Viewing commit 940ffaab
Prev Next
Show latest version
2 files
+ 13
− 12
Compare changes
  • Side-by-side
  • Inline
Files
2
include/caosdb/constants.h.in
+ 8
− 8
@@ -26,18 +26,18 @@
@@ -26,18 +26,18 @@
namespace caosdb {
namespace caosdb {
#endif
#endif
// clang-format off
// clang-format off
const int LIBCAOSDB_VERSION_MAJOR = @libcaosdb_VERSION_MAJOR@;
static const int LIBCAOSDB_VERSION_MAJOR = @libcaosdb_VERSION_MAJOR@;
const int LIBCAOSDB_VERSION_MINOR = @libcaosdb_VERSION_MINOR@;
static const int LIBCAOSDB_VERSION_MINOR = @libcaosdb_VERSION_MINOR@;
const int LIBCAOSDB_VERSION_PATCH = @libcaosdb_VERSION_PATCH@;
static const int LIBCAOSDB_VERSION_PATCH = @libcaosdb_VERSION_PATCH@;
const int COMPATIBLE_SERVER_VERSION_MAJOR = @libcaosdb_COMPATIBLE_SERVER_VERSION_MAJOR@;
static const int COMPATIBLE_SERVER_VERSION_MAJOR = @libcaosdb_COMPATIBLE_SERVER_VERSION_MAJOR@;
const int COMPATIBLE_SERVER_VERSION_MINOR = @libcaosdb_COMPATIBLE_SERVER_VERSION_MINOR@;
static const int COMPATIBLE_SERVER_VERSION_MINOR = @libcaosdb_COMPATIBLE_SERVER_VERSION_MINOR@;
const int COMPATIBLE_SERVER_VERSION_PATCH = @libcaosdb_COMPATIBLE_SERVER_VERSION_PATCH@;
static const int COMPATIBLE_SERVER_VERSION_PATCH = @libcaosdb_COMPATIBLE_SERVER_VERSION_PATCH@;
const char* COMPATIBLE_SERVER_VERSION_PRE_RELEASE = "@libcaosdb_COMPATIBLE_SERVER_VERSION_PRE_RELEASE@";
static const char* COMPATIBLE_SERVER_VERSION_PRE_RELEASE = "@libcaosdb_COMPATIBLE_SERVER_VERSION_PRE_RELEASE@";
/**
/**
* Precedence of configuration files from highest to lowest.
* Precedence of configuration files from highest to lowest.
*/
*/
const char* LIBCAOSDB_CONFIGURATION_FILES_PRECEDENCE[] = {
static const char* LIBCAOSDB_CONFIGURATION_FILES_PRECEDENCE[] = {
"$CAOSDB_CLIENT_CONFIGURATION",
"$CAOSDB_CLIENT_CONFIGURATION",
"caosdb_client.json",
"caosdb_client.json",
"caosdb-client.json",
"caosdb-client.json",