[waffle] [PATCH] revert commit 92116dae to make it build with cmake < 2.8.12

[Jordan Justen]

On 2014-12-04 23:20:29, Chad Versace wrote:
> Jordan and Emil, does reverting 92116dae break anything for you? I don't
> have a Debian-based machine, (and this CMake hack was made specifically
> to silence Debian warnings), so I don't want to commit this without your ok.

I think 92116dae was made to cleanup 62a4aab9. 62a4aab9 was the commit
that silenced the debian warning.

So, debian should be fine with 92116dae reverted. But, Emil's cleanup
in 92116dae is an improvement, so hopefully someday we can bump
waffle's cmake dependency to 2.8.12 and put that back.

-Jordan

> If this revert causes Debian any problems, then I think the next best
> thing is to apply the original CMake hack if cmake<=2.8.11 and use
> PRIVATE and cmake>=2.8.12. In fact, that may be better than the revert.
> What do you think?
> 
> if (CMAKE_MAJOR_VERSION EQUAL 2 AND
>     CMAKE_MINOR_VERSION EQUAL 8 AND
>     CMAKE_PATCH_VERSION LESS 12)
>   # Do old LINK_INTERFACE_LIBRARIES hack.
> else()
>   # Use PRIVATE keyword.
> endif()
> 
> Matej, Chrome OS also still ships cmake-2.8.11 and is carrying a similar
> patch. So I agree with you in that this problem needs to get fixed upstream.
> 
> 
> On 12/04/2014 01:22 PM, Matej Cepl wrote:
> > The commit 92116dae relies on PRIVATE term in target_link_libraries,
> > which has been included only in 2.8.12.
> > 
> > --- a/src/waffle/CMakeLists.txt
> > +++ b/src/waffle/CMakeLists.txt
> > @@ -180,7 +180,7 @@ include_directories(
> >      )
> >  
> >  add_library(${waffle_libname} SHARED ${waffle_sources})
> > -target_link_libraries(${waffle_libname} PRIVATE ${waffle_libdeps})
> > +target_link_libraries(${waffle_libname} ${waffle_libdeps})
> >  
> >  set_target_properties(${waffle_libname}
> >      PROPERTIES
> > @@ -189,6 +189,13 @@ set_target_properties(${waffle_libname}
> >      VERSION ${waffle_soversion}.${waffle_minor_version}.${waffle_patch_version}
> >      )
> >  
> > +if(NOT waffle_on_mac)
> > +    set_target_properties(${waffle_libname}
> > +        PROPERTIES
> > +        LINK_INTERFACE_LIBRARIES ""
> > +        )
> > +endif()
> > +
> >  install(
> >      TARGETS ${waffle_libname}
> >      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
> > _______________________________________________
> > waffle mailing list
> > waffle at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/waffle
> > 
>