Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 18:10:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for new version of cmake

Browse source
This commit is contained in:
Atlante45 2014-12-29 17:23:54 -08:00
parent 0ef26b1446
commit 4586afc6c5
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cmake/macros/IncludeDependencyIncludes.cmake
View file

@ -15,8 +15,11 @@ macro(INCLUDE_DEPENDENCY_INCLUDES)
# include those in our own target # include those in our own target
include_directories(SYSTEM ${${TARGET_NAME}_DEPENDENCY_INCLUDES}) include_directories(SYSTEM ${${TARGET_NAME}_DEPENDENCY_INCLUDES})
endif ()
list(LENGTH ${TARGET_NAME}_DEPENDENCY_INCLUDES NUM_DEPENDENCY_INCLUDES)
# set the property on this target so it can be retreived by targets linking to us if(NUM_DEPENDENCY_INCLUDES STRGREATER 0)
set_target_properties(${TARGET_NAME} PROPERTIES DEPENDENCY_INCLUDES "${${TARGET_NAME}_DEPENDENCY_INCLUDES}") # set the property on this target so it can be retreived by targets linking to us
set_target_properties(${TARGET_NAME} PROPERTIES DEPENDENCY_INCLUDES "${${TARGET_NAME}_DEPENDENCY_INCLUDES}")
endif ()
endif()
endmacro(INCLUDE_DEPENDENCY_INCLUDES) endmacro(INCLUDE_DEPENDENCY_INCLUDES)

8
cmake/macros/LinkHifiLibraries.cmake
View file

@ -27,7 +27,13 @@ macro(LINK_HIFI_LIBRARIES)
# ask the library what its include dependencies are and link them # ask the library what its include dependencies are and link them
get_target_property(LINKED_TARGET_DEPENDENCY_INCLUDES ${HIFI_LIBRARY} DEPENDENCY_INCLUDES) get_target_property(LINKED_TARGET_DEPENDENCY_INCLUDES ${HIFI_LIBRARY} DEPENDENCY_INCLUDES)
list(APPEND ${TARGET_NAME}_DEPENDENCY_INCLUDES ${LINKED_TARGET_DEPENDENCY_INCLUDES})
if(LINKED_TARGET_DEPENDENCY_INCLUDES)
list(LENGTH LINKED_TARGET_DEPENDENCY_INCLUDES NUM_DEPENDENCY_INCLUDES)
if(NUM_DEPENDENCY_INCLUDES STRGREATER 0)
list(APPEND ${TARGET_NAME}_DEPENDENCY_INCLUDES ${LINKED_TARGET_DEPENDENCY_INCLUDES})
endif()
endif()
endforeach() endforeach()
endmacro(LINK_HIFI_LIBRARIES) endmacro(LINK_HIFI_LIBRARIES)