Skip to content

Commit 452784d

Browse files
committed
Use CQL2CPP_VERSION instead of VERSION
Signed-off-by: Kunlin Yu <yukunlin@syriusrobotics.com>
1 parent 4c690a3 commit 452784d

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ project(cql2cpp
55
HOMEPAGE_URL "https://github.com/IndoorSpatial/cql2cpp"
66
LANGUAGES CXX
77
)
8-
add_definitions(-DVERSION="${PROJECT_VERSION}")
8+
add_definitions(-DCQL2CPP_VERSION="${PROJECT_VERSION}")
99

1010
find_package(SQLite3 QUIET)
1111
find_package(libspatialite QUIET)

include/cql2cpp/cql2cpp.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
#include "tree_dot.h"
2525
#include "sql_converter.h"
2626

27-
#ifndef VERSION
28-
#define VERSION "0.0.0"
27+
#ifndef CQL2CPP_VERSION
28+
#define CQL2CPP_VERSION "0.0.0"
2929
#endif
3030

3131
namespace cql2cpp {
@@ -118,7 +118,7 @@ class Cql2Cpp {
118118
return true;
119119
}
120120

121-
static std::string version() { return VERSION; }
121+
static std::string version() { return CQL2CPP_VERSION; }
122122

123123
static bool ConvertToSQL(const std::string& cql2_query,
124124
std::string* sql_where, std::string* error_msg) {

src/main.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
#include <argparse/argparse.hpp>
2323
#include <fstream>
2424

25-
#ifndef VERSION
26-
#define VERSION "0.0.0"
25+
#ifndef CQL2CPP_VERSION
26+
#define CQL2CPP_VERSION "0.0.0"
2727
#endif
2828

2929
int main(int argc, char** argv) {
30-
argparse::ArgumentParser program("cql2", VERSION);
30+
argparse::ArgumentParser program("cql2", CQL2CPP_VERSION);
3131

3232
argparse::ArgumentParser parse_command("parse", "",
3333
argparse::default_arguments::help);

0 commit comments

Comments
 (0)