diff --git a/CMake/options.cmake b/CMake/options.cmake index 8805263c0..cf4914882 100644 --- a/CMake/options.cmake +++ b/CMake/options.cmake @@ -740,18 +740,11 @@ endif ((X11_Xft_FOUND OR NOT USE_PANGOXFT) AND OPTION_USE_PANGO) if (OPTION_USE_WAYLAND AND NOT OPTION_USE_SYSTEM_LIBDECOR) # Note: Disable OPTION_ALLOW_GTK_PLUGIN to get cairo titlebars rather than GTK - # FIXME: This needs to be redesigned! Forcing GTK_FOUND to 0 (NO) is a bad - # FIXME: idea because there could be unwanted side effects. AlbrechtS if (OPTION_ALLOW_GTK_PLUGIN) pkg_check_modules(GTK gtk+-3.0) if (GTK_FOUND) include_directories (${GTK_INCLUDE_DIRS}) endif (GTK_FOUND) - else () - if (GTK_FOUND) - message (STATUS "*** FIXME: Disable GTK plugin by forcing GTK_FOUND to 0 ***") - set (GTK_FOUND 0) - endif (GTK_FOUND) endif (OPTION_ALLOW_GTK_PLUGIN) endif (OPTION_USE_WAYLAND AND NOT OPTION_USE_SYSTEM_LIBDECOR) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a912dc5c3..21d2089a5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -510,12 +510,11 @@ if (OPTION_USE_WAYLAND) else() set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${CMAKE_CURRENT_SOURCE_DIR}/../libdecor/src -I${CMAKE_CURRENT_SOURCE_DIR}/../libdecor/src/plugins -DLIBDECOR_PLUGIN_API_VERSION=1 -DLIBDECOR_PLUGIN_DIR=\\\"\\\" ") set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_SYSTEM_LIBDECOR=0 -DHAVE_MEMFD_CREATE -DHAVE_MKOSTEMP -DHAVE_POSIX_FALLOCATE") + if (GTK_FOUND AND OPTION_ALLOW_GTK_PLUGIN) + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_GTK") + endif (GTK_FOUND AND OPTION_ALLOW_GTK_PLUGIN) endif (OPTION_USE_SYSTEM_LIBDECOR) - if (GTK_FOUND) - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_GTK") - endif (GTK_FOUND) - list (APPEND CFILES scandir_posix.c ../libdecor/src/cursor-settings.c @@ -669,14 +668,13 @@ if (UNIX AND OPTION_USE_WAYLAND) endif (OPTION_USE_GL) if (OPTION_USE_SYSTEM_LIBDECOR) list (APPEND OPTIONAL_LIBS "-ldecor-0") + elseif (GTK_FOUND AND OPTION_ALLOW_GTK_PLUGIN) + list (APPEND OPTIONAL_LIBS ${GTK_LDFLAGS} ) endif (OPTION_USE_SYSTEM_LIBDECOR) list (APPEND OPTIONAL_LIBS "-lwayland-cursor -lwayland-client -lxkbcommon -ldl -ldbus-1") if (NOT OPTION_WAYLAND_ONLY) list (APPEND OPTIONAL_LIBS "-lXcursor -lXrender -lXinerama -lXfixes -lXft -lXext -lX11") endif (NOT OPTION_WAYLAND_ONLY) - if (GTK_FOUND) - list (APPEND OPTIONAL_LIBS ${GTK_LDFLAGS} ) - endif (GTK_FOUND) if (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux" AND NOT OPTION_BUILD_SHARED_LIBS) list (APPEND OPTIONAL_LIBS "-no-pie") endif (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux" AND NOT OPTION_BUILD_SHARED_LIBS)