diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2022-11-23 05:59:57 +0100 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2022-11-23 05:59:57 +0100 |
| commit | 4dcced5b29ec3c26faccfd264909cbebd5ad4f44 (patch) | |
| tree | 108cbc05cc65f4c8ac1ca197eac1492f27a93791 /src | |
| parent | 39bb38447b1deeef6a70bd40530d1bf84859ae98 (diff) | |
Wayland+CMake: stop forcing GTK_FOUND to 0
This removes the cause of this developer's message
# 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
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 12 |
1 files changed, 5 insertions, 7 deletions
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) |