Skip to content

Commit 8395c22

Browse files
levlamlevlam
committed
Improve target_include_directories calls.
1 parent aaddce6 commit 8395c22

2 files changed

Lines changed: 8 additions & 20 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1205,7 +1205,7 @@ if (TD_ENABLE_JNI AND NOT ANDROID) # jni is available by default on Android
12051205
find_package(JNI REQUIRED COMPONENTS JVM)
12061206
endif()
12071207
message(STATUS "Found JNI: ${JNI_INCLUDE_DIRS} ${JNI_LIBRARIES}")
1208-
target_include_directories(tdapi PUBLIC ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
1208+
target_include_directories(tdapi SYSTEM PUBLIC ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
12091209
target_link_libraries(tdapi PUBLIC ${JAVA_JVM_LIBRARY})
12101210
endif()
12111211

@@ -1261,9 +1261,7 @@ if (NOT CMAKE_CROSSCOMPILING)
12611261
endif()
12621262

12631263
add_library(tdclient STATIC td/telegram/Client.cpp td/telegram/Client.h td/telegram/Log.cpp td/telegram/Log.h)
1264-
target_include_directories(tdclient PUBLIC
1265-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
1266-
)
1264+
target_include_directories(tdclient PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
12671265
target_link_libraries(tdclient PUBLIC tdapi PRIVATE tdcore)
12681266

12691267
if (TD_ENABLE_DOTNET)
@@ -1274,9 +1272,7 @@ if (TD_ENABLE_DOTNET)
12741272
)
12751273
set_target_properties(tddotnet PROPERTIES OUTPUT_NAME Telegram.Td)
12761274
target_link_libraries(tddotnet PRIVATE tdclient tdutils)
1277-
target_include_directories(tddotnet PUBLIC
1278-
$<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>
1279-
)
1275+
target_include_directories(tddotnet PUBLIC $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
12801276
if (NOT CMAKE_CROSSCOMPILING)
12811277
add_dependencies(tddotnet generate_dotnet_api)
12821278
endif()
@@ -1293,18 +1289,14 @@ endif()
12931289

12941290
# tdc - TDLib interface in pure C
12951291
add_library(tdc STATIC EXCLUDE_FROM_ALL ${TL_C_SCHEME_SOURCE} td/telegram/td_c_client.cpp td/telegram/td_c_client.h)
1296-
target_include_directories(tdc PUBLIC
1297-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
1298-
$<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
1292+
target_include_directories(tdc PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
12991293
target_link_libraries(tdc PRIVATE tdclient tdutils)
13001294
if (NOT CMAKE_CROSSCOMPILING)
13011295
add_dependencies(tdc tl_generate_c)
13021296
endif()
13031297

13041298
add_library(tdjson_private STATIC ${TL_TD_JSON_SOURCE} td/telegram/ClientJson.cpp td/telegram/ClientJson.h)
1305-
target_include_directories(tdjson_private PUBLIC
1306-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
1307-
$<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
1299+
target_include_directories(tdjson_private PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
13081300
target_link_libraries(tdjson_private PUBLIC tdclient tdutils)
13091301
if (NOT CMAKE_CROSSCOMPILING)
13101302
add_dependencies(tdjson_private tl_generate_common tl_generate_json)
@@ -1321,19 +1313,15 @@ include(GenerateExportHeader)
13211313
add_library(tdjson SHARED ${TD_JSON_SOURCE} ${TD_JSON_HEADERS})
13221314
target_link_libraries(tdjson PRIVATE tdjson_private)
13231315
generate_export_header(tdjson EXPORT_FILE_NAME ${CMAKE_CURRENT_BINARY_DIR}/td/telegram/tdjson_export.h)
1324-
target_include_directories(tdjson PUBLIC
1325-
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
1326-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
1316+
target_include_directories(tdjson PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
13271317
if (APPLE)
13281318
set_target_properties(tdjson PROPERTIES LINK_FLAGS "-Wl,-exported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/tdclientjson_export_list")
13291319
endif()
13301320

13311321
add_library(tdjson_static STATIC ${TD_JSON_SOURCE} ${TD_JSON_HEADERS})
13321322
target_link_libraries(tdjson_static PRIVATE tdjson_private)
13331323
target_compile_definitions(tdjson_static PUBLIC TDJSON_STATIC_DEFINE)
1334-
target_include_directories(tdjson_static PUBLIC
1335-
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
1336-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
1324+
target_include_directories(tdjson_static PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
13371325

13381326
# EXECUTABLES
13391327
if (EMSCRIPTEN)

‎example/java/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ add_custom_target(generate_javadoc
8484
add_library(tdjni SHARED
8585
td_jni.cpp
8686
)
87-
target_include_directories(tdjni PRIVATE ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
87+
target_include_directories(tdjni SYSTEM PRIVATE ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
8888
target_link_libraries(tdjni PRIVATE ${JAVA_JVM_LIBRARY})
8989
target_compile_definitions(tdjni PRIVATE PACKAGE_NAME="${TD_API_JAVA_PACKAGE}")
9090

0 commit comments

Comments
 (0)