summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2016-07-28 21:29:35 -0400
committerAdam <Adam@anope.org>2016-07-28 21:29:35 -0400
commit0e758a2ac23dc4a001e8e126cec14588da9a9769 (patch)
tree45df813323e023c5c89db7279426c4ad0943b4a9 /cmake
parenta3c8afae00c54d5b95c620248b51f90679d7d53f (diff)
Allow serializable fields to use storage in the respective objects.
Split service management code nito a proper servicemanager. Make service references managed instead of lazy lookup. Also made events and serializable use service manager instead of their respective systems for management
Diffstat (limited to 'cmake')
-rw-r--r--cmake/Anope.cmake6
1 files changed, 2 insertions, 4 deletions
diff --git a/cmake/Anope.cmake b/cmake/Anope.cmake
index 7e125692e..ccc734ed9 100644
--- a/cmake/Anope.cmake
+++ b/cmake/Anope.cmake
@@ -90,7 +90,7 @@ macro(add_to_cpack_ignored_files ITEM)
endif()
endmacro()
-macro(calculate_dependencies SRC)
+macro(calculate_dependencies SRC DEPENDENCIES)
file(STRINGS ${SRC} REQUIRED_LIBRARIES REGEX "/\\*[ \t]*Dependencies:[ \t]*.*[ \t]*\\*/")
# Iterate through those lines
foreach(REQUIRED_LIBRARY ${REQUIRED_LIBRARIES})
@@ -99,9 +99,7 @@ macro(calculate_dependencies SRC)
string(REGEX REPLACE "," ";" REQUIRED_LIBRARY ${REQUIRED_LIBRARY})
# Iterate through the libraries given
foreach(LIBRARY ${REQUIRED_LIBRARY})
- get_filename_component(TARGNAME ${SRC} NAME_WE)
- target_link_libraries(${TARGNAME} ${LIBRARY})
- add_dependencies(${TARGNAME} ${LIBRARY})
+ list(APPEND ${DEPENDENCIES} "${LIBRARY}")
endforeach()
endforeach()
endmacro()