← Back to branch summary

~sil2100/compiz-core/fglrx_decor_fix

« back to all changes in this revision

Viewing changes to gtk/window-decorator/CMakeLists.txt

  • Committer: Daniel van Vugt
  • Date: 2012-03-30 07:31:56 UTC
  • mfrom: (3076.1.1 revert-lim)
  • Revision ID: daniel.van.vugt@canonical.com-20120330073156-zkf1b676o3m2vur2
https://launchpad.net/bugs/962085
Revert locally integrated menus support because it is not being used and
is apparently causing a regression (LP: #962085)

This reverts LP: #931245 and LP: #682788. It is a pure revert of
lp:compiz-core r3036.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gtk/window-decorator/CMakeLists.txt
4
4
        set (CMAKE_INSTALL_RPATH ${libdir})
5
5
    endif (COMPIZ_BUILD_WITH_RPATH)
6
6
 
7
 
    add_subdirectory (local-menus)
8
 
 
9
7
    include_directories (
10
 
        ${CMAKE_CURRENT_SOURCE_DIR}/local-menus/src
11
8
        ${compiz_SOURCE_DIR}/include
12
9
        ${CMAKE_BINARY_DIR}/gtk
13
10
        ${GTK_WINDOW_DECORATOR_INCLUDE_DIRS}
66
63
    target_link_libraries (
67
64
        gtk-window-decorator
68
65
        decoration
69
 
 
70
 
        gtk_window_decorator_local_menus
71
 
 
72
66
        ${GTK_WINDOW_DECORATOR_LIBRARIES}
73
67
        ${GCONF_LIBRARIES}
74
68
        ${DBUS_GLIB_LIBRARIES}