Merge pull request #247 from KuribohG/fix-cmake

Enmk · web-flow · commit 0b75de11b954 · 2022-11-21T16:08:22.000+04:00
Update CMake include directories
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,9 +27,6 @@ PROJECT (CLICKHOUSE-CLIENT)
         SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -Wno-deprecated-declarations")
     ENDIF ()
 
-    INCLUDE_DIRECTORIES (.)
-    INCLUDE_DIRECTORIES (contrib)
-
     SUBDIRS (
         clickhouse
         contrib/absl
diff --git a/clickhouse/CMakeLists.txt b/clickhouse/CMakeLists.txt
@@ -43,13 +43,19 @@ TARGET_LINK_LIBRARIES (clickhouse-cpp-lib
     cityhash-lib
     lz4-lib
 )
+TARGET_INCLUDE_DIRECTORIES (clickhouse-cpp-lib
+    PUBLIC ${PROJECT_SOURCE_DIR}
+)
 
 ADD_LIBRARY (clickhouse-cpp-lib-static STATIC ${clickhouse-cpp-lib-src})
 TARGET_LINK_LIBRARIES (clickhouse-cpp-lib-static
     absl-lib
     cityhash-lib
     lz4-lib
 )
+TARGET_INCLUDE_DIRECTORIES (clickhouse-cpp-lib-static
+    PUBLIC ${PROJECT_SOURCE_DIR}
+)
 
 IF (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     INCLUDE (CheckCXXSourceCompiles)
diff --git a/contrib/absl/CMakeLists.txt b/contrib/absl/CMakeLists.txt
@@ -1,3 +1,6 @@
 ADD_LIBRARY (absl-lib STATIC
     numeric/int128.cc
 )
+TARGET_INCLUDE_DIRECTORIES (absl-lib
+    PUBLIC ${PROJECT_SOURCE_DIR}/contrib
+)

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,6 @@`
`1`	`1`	`ADD_LIBRARY (absl-lib STATIC`
`2`	`2`	`numeric/int128.cc`
`3`	`3`	`)`
	`4`	`+TARGET_INCLUDE_DIRECTORIES (absl-lib`
	`5`	`+ PUBLIC ${PROJECT_SOURCE_DIR}/contrib`
	`6`	`+)`