Merge pull request #351 from Enmk/fix_version

Fixed version-related hiccups
ClickHouse · Dec 6, 2023 · 157369c · 157369c
2 parents db374b8 + 21793b8
commit 157369c
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 6 deletions.
diff --git a/clickhouse/version.h b/clickhouse/version.h
@@ -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
diff --git a/cmake/version.cmake b/cmake/version.cmake
@@ -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

diff --git a/ut/client_ut.cpp b/ut/client_ut.cpp
@@ -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) {