kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Try to fix circular dependency between external_scudo and common_options

Browse source
This commit is contained in:
Ilya Fedin 2023-12-31 22:37:30 +04:00 • committed by John Preston
parent aa6d01e1be
commit 4005d7befb
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
init_target.cmake
View file

@ -27,6 +27,14 @@ function(init_target target_name) # init_target(my_target [cxx_std_..] folder_na
set_property(TARGET ${target_name} APPEND_STRING PROPERTY STATIC_LIBRARY_OPTIONS "$<IF:$<CONFIG:Debug>,,/LTCG>") set_property(TARGET ${target_name} APPEND_STRING PROPERTY STATIC_LIBRARY_OPTIONS "$<IF:$<CONFIG:Debug>,,/LTCG>")
endif() endif()
if (LINUX AND NOT DESKTOP_APP_DISABLE_SCUDO AND NOT target_name STREQUAL external_scudo)
add_dependencies(${target_name} desktop-app::external_scudo)
target_link_options(${target_name}
PRIVATE
-Wl,--push-state,--whole-archive,$<TARGET_FILE:desktop-app::external_scudo>,--pop-state
)
endif()
target_link_libraries(${target_name} PRIVATE desktop-app::common_options) target_link_libraries(${target_name} PRIVATE desktop-app::common_options)
set_target_properties(${target_name} PROPERTIES set_target_properties(${target_name} PROPERTIES
XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_WEAK YES XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_WEAK YES

8
options_linux.cmake
View file

@ -99,14 +99,6 @@ if (NOT DESKTOP_APP_USE_PACKAGED OR DESKTOP_APP_SPECIAL_TARGET)
) )
endif() endif()
if (NOT DESKTOP_APP_DISABLE_SCUDO)
target_link_libraries(common_options
INTERFACE
$<LINK_ONLY:desktop-app::external_scudo>
-Wl,--push-state,--whole-archive,$<TARGET_FILE:desktop-app::external_scudo>,--pop-state
)
endif()
if (DESKTOP_APP_USE_ALLOCATION_TRACER) if (DESKTOP_APP_USE_ALLOCATION_TRACER)
target_link_options(common_options target_link_options(common_options
INTERFACE INTERFACE