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

CMake: Fix up the "transitive library" metalib logic

Browse Source 
This fixes some cases where transitive libraries, as nominated
by a component library, were not being absorbed into a metalib,
due to the library actually not being defined yet. This makes the
logic a little more robust, first by explicitly requiring a metalib
definition to come after all component library definitions, and second
to assume a library "linked" to a component library is a non-component
if it isn't defined (yet).
This commit is contained in:
Sam Edwards 2018-04-20 00:20:14 -06:00
parent 570afa6973
commit 5b3ca1bb05
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmake/macros/BuildMetalib.cmake
View File

@ -41,9 +41,14 @@ function(target_link_libraries target)
# care of this at configuration time.
if(TARGET "${library}")
get_target_property(is_component "${library}" IS_COMPONENT)
if(NOT is_component)
set_property(TARGET "${target}" APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${library}")
endif()
else()
# This is a safe assumption, since we define all component libraries
# before the metalib they appear in:
set(is_component OFF)
endif()
if(NOT is_component)
set_property(TARGET "${target}" APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${library}")
endif()
else()
# This is a file path to an out-of-tree library - this needs to be
@ -133,6 +138,11 @@ function(add_metalib target_name)
set(includes)
set(libs)
foreach(component ${components})
if(NOT TARGET "${component}")
message(FATAL_ERROR
"Missing component library ${component} referenced by metalib ${target_name}!
(Component library targets must be created BEFORE add_metalib.)")
endif()
get_target_property(is_component "${component}" IS_COMPONENT)
if(NOT is_component)
message(FATAL_ERROR