Skip to content

Fixed version-related hiccups #351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Enmk merged 1 commit into from
Dec 6, 2023
Merged

Fixed version-related hiccups #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions clickhouse/version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,3 @@
+ CLICKHOUSE_CPP_VERSION_MINOR * 100 * 100 \
+ CLICKHOUSE_CPP_VERSION_PATCH * 100 \
+ CLICKHOUSE_CPP_VERSION_BUILD

#define CLICKHOUSE_CPP_VERSION_STRING #CLICKHOUSE_CPP_VERSION_MAJOR "." #CLICKHOUSE_CPP_VERSION_MINOR "." #CLICKHOUSE_CPP_VERSION_PATCH
3 changes: 1 addition & 2 deletions cmake/version.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,11 @@ function (regex_extract_matching_groups INPUT REGEX_STR)
endforeach ()
endfunction ()

regex_extract_matching_groups("ttest" "FAILED TO SERCH" RESULT)

function(clickhouse_cpp_get_version)
# Extract all components of the version from the clickhouse/version.h

file(READ ${CMAKE_SOURCE_DIR}/clickhouse/version.h VERSION_FILE_DATA)
file(READ ${CMAKE_CURRENT_SOURCE_DIR}/clickhouse/version.h VERSION_FILE_DATA)

foreach (VERSION_COMPONENT
IN ITEMS
Expand Down
2 changes: 0 additions & 2 deletions ut/client_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,6 @@ TEST_P(ClientCase, Version) {
EXPECT_EQ(CLICKHOUSE_CPP_VERSION_PATCH, version.patch);
EXPECT_EQ(CLICKHOUSE_CPP_VERSION_BUILD, version.build);
EXPECT_EQ(CLICKHOUSE_CPP_VERSION_PATCH, version.patch);

// EXPECT_EQ(CLICKHOUSE_CPP_VERSION, versionNumber(version.major, version.minor, version.patch, version.build));
}

TEST_P(ClientCase, Array) {
Expand Down