Skip to content

Commit a2c17ec

Browse files
committed
Fix msvc ut build, fix due to alias to static
1 parent 63b9356 commit a2c17ec

File tree

3 files changed

+4
-11
lines changed

3 files changed

+4
-11
lines changed

CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ PROJECT (CLICKHOUSE-CLIENT)
6262
SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lgcc_s")
6363
ENDIF ()
6464

65-
INCLUDE_DIRECTORIES (.)
66-
6765
IF (WITH_SYSTEM_ABSEIL)
6866
FIND_PACKAGE(absl REQUIRED)
6967
ELSE ()

clickhouse/CMakeLists.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,6 @@ TARGET_INCLUDE_DIRECTORIES (clickhouse-cpp-lib
5252
IF (NOT BUILD_SHARED_LIBS)
5353
ADD_LIBRARY (clickhouse-cpp-lib-static ALIAS clickhouse-cpp-lib)
5454
ENDIF()
55-
ADD_LIBRARY (clickhouse-cpp-lib-static STATIC ${clickhouse-cpp-lib-src})
56-
TARGET_LINK_LIBRARIES (clickhouse-cpp-lib-static
57-
absl::int128
58-
cityhash::cityhash
59-
lz4::lz4
60-
)
61-
TARGET_INCLUDE_DIRECTORIES (clickhouse-cpp-lib-static
62-
PUBLIC ${PROJECT_SOURCE_DIR}
63-
)
6455

6556

6657
IF (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")

ut/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,7 @@ TARGET_LINK_LIBRARIES (clickhouse-cpp-ut
3939
clickhouse-cpp-lib
4040
gtest-lib
4141
)
42+
43+
IF (MSVC)
44+
TARGET_COMPILE_OPTIONS(clickhouse-cpp-ut PRIVATE /bigobj)
45+
ENDIF()

0 commit comments

Comments
 (0)