Attachment 2975 Details for Bug 3133 – Patch to add tde_add_library "LINK_PRIVATE" option and stop LINGUAS source writes

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] Patch to add tde_add_library "LINK_PRIVATE" option and stop LINGUAS source writes

cmake-git-macros.patch (text/plain), 2.59 KB, created by aneejit1 on 2020-06-10 14:24:49 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: aneejit1

Created: 2020-06-10 14:24:49 CDT

Size: 2.59 KB

patch

obsolete

>diff -urN cmake-trinity-git/modules/TDEMacros.cmake q/modules/TDEMacros.cmake
>--- cmake-trinity-git/modules/TDEMacros.cmake	2020-06-10 17:55:54.000000000 +0100
>+++ q/modules/TDEMacros.cmake	2020-06-10 18:10:45.631461331 +0100
>@@ -855,6 +855,12 @@
>       set( _storage "_link" )
>     endif( "+${_arg}" STREQUAL "+LINK" )
> 
>+    # found directive "LINK_PRIVATE"
>+    if( "+${_arg}" STREQUAL "+LINK_PRIVATE" )
>+      set( _skip_store 1 )
>+      set( _storage "_link_private" )
>+    endif( "+${_arg}" STREQUAL "+LINK_PRIVATE" )
>+
>     # found directive "DEPENDENCIES"
>     if( "+${_arg}" STREQUAL "+DEPENDENCIES" )
>       set( _skip_store 1 )
>@@ -1027,12 +1033,18 @@
>       target_link_libraries( ${_target} ${_link} )
>     endif( _embed AND  ${CMAKE_VERSION} VERSION_EQUAL "2.8.12.0" )
>   endif( )
>+
>   if( _shared_libs )
>     set_target_properties( ${_target} PROPERTIES
>                            LINK_INTERFACE_LIBRARIES "${_shared_libs}"
>                            INTERFACE_LINK_LIBRARIES "${_shared_libs}" )
>   endif( _shared_libs )
> 
>+  # set private link libraries
>+  if( _link_private )
>+    target_link_libraries( ${_target} PRIVATE ${_link_private} )
>+  endif( )
>+
>   # set dependencies
>   if( _dependencies )
>     add_dependencies( ${_target} ${_dependencies} )
>@@ -1874,8 +1886,7 @@
>     if( DESKTOP_MERGE_MSGFMT )
> 
>       # create LINGUAS file for msgfmt
>-      string( REPLACE ".po;" "\n" _linguas "${_translations};" )
>-      file( WRITE ${_po_dir}/LINGUAS "${_linguas}" )
>+      string( REPLACE ".po;" " " _linguas "${_translations};" )
> 
>       # prepare keywords for msgfmt
>       set( _keywords_arg "--keyword=" )
>@@ -1887,22 +1898,12 @@
>       get_filename_component( _src ${_src} ABSOLUTE )
>       add_custom_command(
>         OUTPUT ${_basename}
>+        COMMAND export LINGUAS="${_linguas}"
>         COMMAND ${MSGFMT_EXECUTABLE} --desktop --template ${_src} -d ${_po_dir} -o ${_basename} ${_keywords_arg}
>+        COMMAND unset LINGUAS
>         DEPENDS ${_src}
>       )
> 
>-      # cleanup LINGUAS file
>-      get_filename_component( _linguas_path "${_po_dir}/LINGUAS" ABSOLUTE )
>-      file( RELATIVE_PATH _linguas_path "${CMAKE_SOURCE_DIR}" "${_linguas_path}" )
>-      string( REPLACE "/" "+" _linguas_cleanup_target "${_linguas_path}-cleanup" )
>-      if( NOT TARGET ${_linguas_cleanup_target} )
>-        add_custom_target( ${_linguas_cleanup_target} ALL
>-          COMMAND ${CMAKE_COMMAND} -E remove ${_po_dir}/LINGUAS
>-          COMMENT "Cleanup ${_linguas_path} file..."
>-        )
>-      endif( )
>-      add_dependencies( ${_linguas_cleanup_target} "${_target}" )
>-
>     else( )
> 
>       # create template for intltool-merge

Actions: View | Diff

Attachments on bug 3133: 2975