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

Matej Cepl mcepl at cepl.eu
Thu Dec 4 13:22:16 PST 2014


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}


More information about the waffle mailing list