Wingpanel

Merge lp:~ricotz/wingpanel/mutter-3.24 into lp:~wingpanel-devs/wingpanel/trunk

  1. mutter-3.24
  2. Merge into trunk
Proposed by Rico Tzschichholz
Status: Merged
Merged at revision: 171
Proposed branch: lp:~ricotz/wingpanel/mutter-3.24
Merge into: lp:~wingpanel-devs/wingpanel/trunk
Diff against target: 20 lines (+6/-1)
1 file modified
wingpanel-interface/CMakeLists.txt (+6/-1)
To merge this branch: bzr merge lp:~ricotz/wingpanel/mutter-3.24
Reviewer Review Type Date Requested Status
WingPanel Devs Pending
Review via email: mp+317700@code.launchpad.net

Commit message

Add support for gala built with libmutter-0 >= 3.23.90

Description of the change

Add support for gala built with libmutter-0 >= 3.23.90

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'wingpanel-interface/CMakeLists.txt'
2--- wingpanel-interface/CMakeLists.txt 2016-12-21 14:50:32 +0000
3+++ wingpanel-interface/CMakeLists.txt 2017-02-18 08:22:28 +0000
4@@ -31,10 +31,15 @@
5 target_link_libraries(${WINGPANELINTERFACE} ${PLUGIN_LIBRARIES})
6
7 # Add -rpath ldflag if libgala is using mutter >= 3.21 to pick up libmutter-*.so
8-pkg_check_modules(MUTTER322 QUIET libmutter>=3.21)
9+pkg_check_modules(MUTTER322 QUIET libmutter>=3.21 libmutter<3.23.90)
10 if (MUTTER322_FOUND)
11 _pkgconfig_invoke("libmutter" MUTTER TYPELIB_DIR "" "--variable=typelibdir")
12 set_target_properties(${WINGPANELINTERFACE} PROPERTIES LINK_FLAGS -Wl,-rpath,${MUTTER_TYPELIB_DIR})
13 endif ()
14+pkg_check_modules(MUTTER324 QUIET libmutter-0>=3.23.90)
15+if (MUTTER324_FOUND)
16+ _pkgconfig_invoke("libmutter-0" MUTTER TYPELIB_DIR "" "--variable=typelibdir")
17+ set_target_properties(${WINGPANELINTERFACE} PROPERTIES LINK_FLAGS -Wl,-rpath,${MUTTER_TYPELIB_DIR})
18+endif ()
19
20 install (TARGETS ${WINGPANELINTERFACE} DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/gala/plugins)

Subscribers

People subscribed via source and target branches