romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-06-06 15:54:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

eliminate _definitions_l in favor of _definitions

Browse source
This commit is contained in:
Viktor Szakats 2025-07-04 06:15:54 +02:00
parent 42fdc65a98
commit d15f2e8f77
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CMake/Macros.cmake
View file

@ -113,7 +113,7 @@ macro(curl_collect_target_options _target)
endif()
get_target_property(_val ${_lib} COMPILE_DEFINITIONS)
if(_val)
list(APPEND _definitions_l ${_val})
list(APPEND _definitions ${_val})
endif()
curl_collect_target_options(${_lib})
endif()
@ -127,7 +127,7 @@ macro(curl_add_clang_tidy_test_target _target_clang_tidy _target)
# Collect header directories and macro definitions from lib dependencies
set(_includes_l "")
set(_definitions_l "")
set(_definitions "")
curl_collect_target_options(${_target})
# Collect header directories applying to the target
@ -145,7 +145,7 @@ macro(curl_add_clang_tidy_test_target _target_clang_tidy _target)
unset(_definitions_t)
endif()
set(_definitions "${_definitions_l};${_definitions_d};${_definitions_t}")
set(_definitions "${_definitions};${_definitions_d};${_definitions_t}")
list(REMOVE_ITEM _definitions "")
string(REPLACE ";" ";-D" _definitions ";${_definitions}")
list(SORT _definitions) # Sort like CMake does
@ -168,7 +168,6 @@ macro(curl_add_clang_tidy_test_target _target_clang_tidy _target)
unset(_includes_d)
unset(_includes_t)
unset(_includes)
unset(_definitions_l)
unset(_definitions_d)
unset(_definitions_t)
unset(_definitions)