From 78dd7c5f8d9b253f4439fa9d1ea5168cfe46b4cc Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 14 Jun 2017 21:16:30 -0400 Subject: Drop x11 dependency. On macOS, it's added if GTK+ 2 uses the x11 backends, which seems a bit silly since Inkscape is using GTK+ 3. Linux also doesn't appear to require x11 linkage, especially if using Wayland as a backend. --- CMakeScripts/ConfigEnv.cmake | 4 ---- CMakeScripts/DefineDependsandFlags.cmake | 12 ------------ 2 files changed, 16 deletions(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/ConfigEnv.cmake b/CMakeScripts/ConfigEnv.cmake index dd4e7e10c..1c4a64b39 100644 --- a/CMakeScripts/ConfigEnv.cmake +++ b/CMakeScripts/ConfigEnv.cmake @@ -47,8 +47,4 @@ if(APPLE) if(DEFINED ENV{GTKMM_BASEPATH}) message("GTKMM_BASEPATH: $ENV{GTKMM_BASEPATH}") endif() - - # detect current GTK+ backend - pkg_check_variable(gtk+-2.0 target) - message("GTK2 backend: ${GTK+_2.0_TARGET}") endif() diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index cfa5792aa..6967e8149 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -57,18 +57,6 @@ add_definitions(${INKSCAPE_DEP_CFLAGS_OTHER}) if(APPLE AND DEFINED ENV{CMAKE_PREFIX_PATH}) list(APPEND INKSCAPE_LIBS "-L$ENV{CMAKE_PREFIX_PATH}/lib") endif() -if(APPLE) - if(${GTK+_2.0_TARGET} MATCHES "x11") - pkg_check_modules(x11 REQUIRED x11) - list(APPEND INKSCAPE_LIBS ${x11_LDFLAGS}) - endif() -elseif(WIN32) -# X11 not available on windows -else() - pkg_check_modules(x11 REQUIRED x11) - list(APPEND INKSCAPE_LIBS ${x11_LDFLAGS}) - -endif() if(WITH_GNOME_VFS) find_package(GnomeVFS2) -- cgit v1.2.3