Attachment 1738 Details for Bug 1759 – Fix build with cmake >= 2.8.12

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] Fix build with cmake >= 2.8.12

fix-cmake-2.8.12.diff (text/plain), 1.92 KB, created by Slávek Banko on 2013-12-21 21:12:46 CST

(hide)

Description:

Filename:

MIME Type:

Creator: Slávek Banko

Created: 2013-12-21 21:12:46 CST

Size: 1.92 KB

patch

obsolete

>Index: b/cmake/modules/TDEMacros.cmake
>===================================================================
>--- a/cmake/modules/TDEMacros.cmake
>+++ b/cmake/modules/TDEMacros.cmake
>@@ -684,16 +684,20 @@
>   endif( _version )
> 
>   # set interface libraries (only for shared)
>-  unset( _shared_libs )
>-  foreach( _lib ${_link} )
>-    #get_target_property( _lib_type ${_lib} TYPE )
>-    #if( NOT "STATIC_LIBRARY" STREQUAL "${_lib_type}" )
>-    if( NOT ${_lib} MATCHES ".+-static" )
>-      list( APPEND _shared_libs ${_lib} )
>-    endif( NOT ${_lib} MATCHES ".+-static" )
>-    #endif( NOT "STATIC_LIBRARY" STREQUAL "${_lib_type}" )
>-  endforeach( _lib )
>-  target_link_libraries( ${_target} LINK_INTERFACE_LIBRARIES ${_shared_libs} )
>+  if( NOT ${_type} STREQUAL "STATIC" )
>+    unset( _shared_libs )
>+    foreach( _lib ${_link} )
>+      #get_target_property( _lib_type ${_lib} TYPE )
>+      #if( NOT "STATIC_LIBRARY" STREQUAL "${_lib_type}" )
>+      if( NOT ${_lib} MATCHES ".+-static" )
>+        list( APPEND _shared_libs ${_lib} )
>+      endif( NOT ${_lib} MATCHES ".+-static" )
>+      #endif( NOT "STATIC_LIBRARY" STREQUAL "${_lib_type}" )
>+    endforeach( _lib )
>+    set_target_properties( ${_target} PROPERTIES
>+                           LINK_INTERFACE_LIBRARIES "${_shared_libs}"
>+                           INTERFACE_LINK_LIBRARIES "${_shared_libs}" )
>+  endif( NOT ${_type} STREQUAL "STATIC" )
> 
>   # set embedded archives
>   if( _embed )
>@@ -702,7 +706,12 @@
> 
>   # set link libraries
>   if( _link )
>-    target_link_libraries( ${_target} ${_link} )
>+    if( _embed AND ${CMAKE_VERSION} VERSION_EQUAL "2.8.12.0" )
>+      # hack for broken CMake 2.8.12.0
>+      set_target_properties( ${_target} PROPERTIES LINK_LIBRARIES "${_link}" )
>+    else( _embed AND  ${CMAKE_VERSION} VERSION_EQUAL "2.8.12.0" )
>+      target_link_libraries( ${_target} ${_link} )
>+    endif( _embed AND  ${CMAKE_VERSION} VERSION_EQUAL "2.8.12.0" )
>   endif( )
> 
>   # set dependencies

Actions: View | Diff

Attachments on bug 1759: 1738 | 1739 | 1740 | 1741