Skip to content

Commit d1eb992

Browse files
authored
CBL-7602: Don't use global include_directories (#2390)
Found two instances of global include_directories, one in lite-core/CMakeLists.txt and the other in lite-core/cmake/platform_linux_desktop.cmake. Replacing them with target_include_directories. Backport from CBL 7203
1 parent 4126e07 commit d1eb992

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

CMakeLists.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ set(MBEDTLS_FATAL_WARNINGS OFF CACHE INTERNAL "") # Work around doc-comment synt
175175
add_subdirectory(vendor/mbedtls EXCLUDE_FROM_ALL)
176176

177177
configure_file(cmake/config_thread.h.in ${GENERATED_HEADERS_DIR}/config_thread.h)
178-
include_directories(${GENERATED_HEADERS_DIR})
179178

180179
add_subdirectory(Networking/BLIP EXCLUDE_FROM_ALL)
181180

@@ -189,7 +188,9 @@ endif()
189188
# Separate library to make possible replace or not use
190189
# during static linking
191190
add_library(CouchbaseSqlite3 STATIC LiteCore/Storage/SQLiteChooser.c)
192-
target_include_directories(CouchbaseSqlite3 PUBLIC vendor/SQLiteCpp/sqlite3)
191+
target_include_directories(CouchbaseSqlite3 PUBLIC vendor/SQLiteCpp/sqlite3
192+
PRIVATE ${GENERATED_HEADERS_DIR}
193+
)
193194
target_compile_definitions(
194195
CouchbaseSqlite3
195196
PUBLIC
@@ -278,10 +279,12 @@ set(
278279

279280
target_include_directories(
280281
LiteCoreObjects PRIVATE
282+
${GENERATED_HEADERS_DIR}
281283
${LiteCoreObjectsIncludes}
282284
)
283285
target_include_directories(
284286
LiteCoreUnitTesting PRIVATE
287+
${GENERATED_HEADERS_DIR}
285288
${LiteCoreObjectsIncludes}
286289
)
287290

@@ -319,6 +322,7 @@ if(LITECORE_BUILD_SHARED)
319322
LiteCore INTERFACE
320323
C/include
321324
C/Cpp_include
325+
PRIVATE ${GENERATED_HEADERS_DIR}
322326
)
323327
target_link_libraries(LiteCore PRIVATE ${LITECORE_LIBRARIES_PRIVATE})
324328

@@ -396,6 +400,7 @@ set(
396400
add_library(LiteCoreWebSocket STATIC EXCLUDE_FROM_ALL ${LC_WEBSOCKET_SRC})
397401
target_include_directories(
398402
LiteCoreWebSocket PRIVATE
403+
${GENERATED_HEADERS_DIR}
399404
C
400405
C/include
401406
C/Cpp_include

cmake/platform_linux_desktop.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,10 @@ function(setup_globals)
5959
if (NOT ZLIB_INCLUDE)
6060
message(FATAL_ERROR "libz header files not found")
6161
endif()
62-
include_directories(${ZLIB_INCLUDE})
6362
message("Using libz header files in ${ZLIB_INCLUDE}")
6463

6564
mark_as_advanced(
66-
ZLIB_LIB ZLIB_INCLUDE
65+
ZLIB_LIB ZLIB_INCLUDE
6766
)
6867
endfunction()
6968

@@ -99,6 +98,7 @@ function(setup_litecore_build)
9998
${liteCoreVariant} INTERFACE
10099
Threads::Threads
101100
)
101+
target_include_directories(${liteCoreVariant} PRIVATE ${ZLIB_INCLUDE})
102102
endforeach()
103103

104104
if(NOT LITECORE_DISABLE_ICU AND NOT LITECORE_DYNAMIC_ICU)

0 commit comments

Comments
 (0)