diff options
| author | Julian Andres Klode <jak@debian.org> | 2017-10-23 03:29:10 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2017-10-23 04:19:19 +0200 |
| commit | 43b9eb5bac15666fdc0346aca7031fab0fa5e064 (patch) | |
| tree | 4e40fe1a78569bceb4dc0fed677188e902244b86 /CMake | |
| parent | 669b310a6676f2247165e492b673d2e5bcb06f89 (diff) | |
CMake: methods: Cleanup link libraries, use OBJECT libraries
Use OBJECT libraries for http and connect stuff, and move the
seccomp link expression into a global link_libraries() call.
This also fixes a bug where only the http target pulled in
the gnutls header arguments despite gnutls being used in
connect.cc, and thus by mirror and ftp as well.
Adjust translation support to ignore TARGET_OBJECTS sources
and add the OBJECT libraries to the translated files.
Diffstat (limited to 'CMake')
| -rw-r--r-- | CMake/Translations.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/CMake/Translations.cmake b/CMake/Translations.cmake index 79f2633a7..9a7127e07 100644 --- a/CMake/Translations.cmake +++ b/CMake/Translations.cmake @@ -31,6 +31,11 @@ function(apt_add_translation_domain) get_target_property(source_dir ${target} SOURCE_DIR) get_target_property(sources ${target} SOURCES) foreach(source ${sources}) + if (source MATCHES TARGET_OBJECTS) + message(IGNORE ${source}) + continue() + endif() + message(ADD ${source}) path_join(file "${source_dir}" "${source}") file(RELATIVE_PATH relfile ${PROJECT_SOURCE_DIR} ${file}) set(files ${files} ${relfile}) |