diff options
| author | Julian Andres Klode <jak@debian.org> | 2020-08-04 10:12:30 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2020-08-04 10:12:30 +0000 |
| commit | 11530bab64efd4b4fc46de7833533cea9c69f521 (patch) | |
| tree | c80fac24e28f09547334660ba6cc717bc5156c99 /CMake | |
| parent | 1afe7c8b874abb61cde591e0241b967ef1b99991 (diff) | |
| parent | 7d8bb855487d6821b0cd6bf5d2270ed8fda3d1a3 (diff) | |
Merge branch 'pu/less-slaves' into 'master'
Remove master/slave terminology
See merge request apt-team/apt!124
Diffstat (limited to 'CMake')
| -rw-r--r-- | CMake/Misc.cmake | 18 | ||||
| -rw-r--r-- | CMake/Translations.cmake | 8 |
2 files changed, 13 insertions, 13 deletions
diff --git a/CMake/Misc.cmake b/CMake/Misc.cmake index 6ad0b9479..8cb18b6ac 100644 --- a/CMake/Misc.cmake +++ b/CMake/Misc.cmake @@ -51,17 +51,17 @@ function(add_vendor_file) endfunction() # Add symbolic links to a file -function(add_slaves destination master) - set(slaves "") - foreach(slave ${ARGN}) - add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${slave} - COMMAND ${CMAKE_COMMAND} -E create_symlink ${master} ${CMAKE_CURRENT_BINARY_DIR}/${slave}) - list(APPEND slaves ${CMAKE_CURRENT_BINARY_DIR}/${slave}) +function(add_links directory target) + set(link_names "") + foreach(link_name ${ARGN}) + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${link_name} + COMMAND ${CMAKE_COMMAND} -E create_symlink ${target} ${CMAKE_CURRENT_BINARY_DIR}/${link_name}) + list(APPEND link_names ${CMAKE_CURRENT_BINARY_DIR}/${link_name}) endforeach() - STRING(REPLACE "/" "-" master "${master}") - add_custom_target(${master}-slaves ALL DEPENDS ${slaves}) - install(FILES ${slaves} DESTINATION ${destination}) + STRING(REPLACE "/" "-" target "${target}") + add_custom_target(${target}-link_names ALL DEPENDS ${link_names}) + install(FILES ${link_names} DESTINATION ${directory}) endfunction() # Generates a simple version script versioning everything with current SOVERSION diff --git a/CMake/Translations.cmake b/CMake/Translations.cmake index 54a635ab6..24925105c 100644 --- a/CMake/Translations.cmake +++ b/CMake/Translations.cmake @@ -136,8 +136,8 @@ function(apt_add_update_po) list(APPEND potfiles ${CMAKE_CURRENT_BINARY_DIR}/${domain}.pot) endforeach() - get_filename_component(master_name ${output} NAME_WE) - add_custom_target(nls-${master_name} + get_filename_component(primary_name ${output} NAME_WE) + add_custom_target(nls-${primary_name} COMMAND msgcomm --sort-by-file --add-location=file --more-than=0 --output=${output} ${potfiles} @@ -154,11 +154,11 @@ function(apt_add_update_po) endif() add_custom_target(update-po-${langcode} COMMAND msgmerge -q --previous --update --backup=none ${translation} ${output} - DEPENDS nls-${master_name} + DEPENDS nls-${primary_name} ) add_dependencies(update-po update-po-${langcode}) endforeach() - add_dependencies(update-po nls-${master_name}) + add_dependencies(update-po nls-${primary_name}) endfunction() function(apt_add_po_statistics excluded) |