TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 01:07:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

CMake: Fix BuildMetalib's BUILDING_ symbol propagation

Browse Source
This commit is contained in:
Sam Edwards 2018-10-11 17:37:23 -06:00
parent da9bb2aaa2
commit 1e38910d9d
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cmake/macros/BuildMetalib.cmake
View File

@ -151,8 +151,17 @@ function(add_component_library target_name)
INIT_FUNCTION "${init_func}"
INIT_HEADER "${init_header}")
if(symbol)
# ... DEFINE_SYMBOL is apparently not respected for object libraries?
set_property(TARGET "${target_name}" APPEND PROPERTY COMPILE_DEFINITIONS "${symbol}")
set_property(TARGET "${target_name}" PROPERTY DEFINE_SYMBOL "${symbol}")
if(BUILD_METALIBS)
# ... DEFINE_SYMBOL is apparently not respected for object libraries?
set_property(TARGET "${target_name}" APPEND PROPERTY COMPILE_DEFINITIONS "${symbol}")
# Make sure other component libraries relying on this one inherit the
# symbol
set_property(TARGET "${target_name}" APPEND PROPERTY
INTERFACE_COMPILE_DEFINITIONS "$<$<BOOL:$<TARGET_PROPERTY:IS_COMPONENT>>:${symbol}>")
endif()
endif()
if(BUILD_METALIBS)
# Apparently neither is CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE?
@ -243,10 +252,19 @@ function(add_metalib target_name)
# Private defines: Just reference using a generator expression
list(APPEND private_defines "$<TARGET_PROPERTY:${component},COMPILE_DEFINITIONS>")
# Interface defines: Copy those
# Interface defines: Copy those, but filter out generator expressions
# referencing a component library
get_target_property(component_defines "${component}" INTERFACE_COMPILE_DEFINITIONS)
if(component_defines)
list(APPEND interface_defines ${component_defines})
foreach(component_define ${component_defines})
if(component_define MATCHES "${component_genex_regex}")
# Filter, it's a genex referencing one of our components
elseif(component_define MATCHES ".*IS_COMPONENT.*")
# Filter, it's testing to see if the consumer is a component
else()
list(APPEND interface_defines ${component_define})
endif()
endforeach(component_define)
endif()
# Include directories: Filter out anything that references a component