Fix build with cmake >= 2.8.12

This resolves Bug 1759
pull/1/head
Slávek Banko 11 years ago
parent 541bb2f48a
commit ce8049e3aa

@ -685,15 +685,16 @@ macro( tde_add_library _arg_target )
# set interface libraries (only for shared) # set interface libraries (only for shared)
unset( _shared_libs ) unset( _shared_libs )
foreach( _lib ${_link} ) if( NOT ${_type} STREQUAL "STATIC" )
#get_target_property( _lib_type ${_lib} TYPE ) foreach( _lib ${_link} )
#if( NOT "STATIC_LIBRARY" STREQUAL "${_lib_type}" ) #get_target_property( _lib_type ${_lib} TYPE )
if( NOT ${_lib} MATCHES ".+-static" ) #if( NOT "STATIC_LIBRARY" STREQUAL "${_lib_type}" )
list( APPEND _shared_libs ${_lib} ) if( NOT ${_lib} MATCHES ".+-static" )
endif( NOT ${_lib} MATCHES ".+-static" ) list( APPEND _shared_libs ${_lib} )
#endif( NOT "STATIC_LIBRARY" STREQUAL "${_lib_type}" ) endif( NOT ${_lib} MATCHES ".+-static" )
endforeach( _lib ) #endif( NOT "STATIC_LIBRARY" STREQUAL "${_lib_type}" )
target_link_libraries( ${_target} LINK_INTERFACE_LIBRARIES ${_shared_libs} ) endforeach( _lib )
endif( NOT ${_type} STREQUAL "STATIC" )
# set embedded archives # set embedded archives
if( _embed ) if( _embed )
@ -702,8 +703,18 @@ macro( tde_add_library _arg_target )
# set link libraries # set link libraries
if( _link ) 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( ) endif( )
if( _shared_libs )
set_target_properties( ${_target} PROPERTIES
LINK_INTERFACE_LIBRARIES "${_shared_libs}"
INTERFACE_LINK_LIBRARIES "${_shared_libs}" )
endif( _shared_libs )
# set dependencies # set dependencies
if( _dependencies ) if( _dependencies )

Loading…
Cancel
Save