From aa90657ac9e33e7df2f2613c914829be95b6540c Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Tue, 13 Jun 2017 23:50:24 +0200 Subject: cmake: Fix install target on Windows after 21c9bc7b2cf2fbda2ed1dd5841eb9333bb274023 --- CMakeScripts/Install.cmake | 2 +- CMakeScripts/InstallMSYS2.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/Install.cmake b/CMakeScripts/Install.cmake index 782161dc2..a188ba2c9 100644 --- a/CMakeScripts/Install.cmake +++ b/CMakeScripts/Install.cmake @@ -10,7 +10,7 @@ if(WIN32) AUTHORS COPYING NEWS - README + README.md TRANSLATORS GPL2.txt GPL3.txt diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake index dcdc738a0..89643a01a 100644 --- a/CMakeScripts/InstallMSYS2.cmake +++ b/CMakeScripts/InstallMSYS2.cmake @@ -3,7 +3,7 @@ if(WIN32) AUTHORS COPYING NEWS - README + README.md TRANSLATORS GPL2.txt GPL3.txt -- cgit v1.2.3 From 90117bb7fda423e1442619b47c6ece734506e56c Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 14 Jun 2017 18:10:50 -0400 Subject: Remove outdated checks for GTK+ functions. gtk_window_fullscreen was added in 2.2 and gtk_window_set_default_icon_from_file is not even used. --- CMakeScripts/ConfigChecks.cmake | 2 -- 1 file changed, 2 deletions(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/ConfigChecks.cmake b/CMakeScripts/ConfigChecks.cmake index 3d986d8dd..bd01639ef 100644 --- a/CMakeScripts/ConfigChecks.cmake +++ b/CMakeScripts/ConfigChecks.cmake @@ -20,8 +20,6 @@ CHECK_FUNCTION_EXISTS(fpsetmask HAVE_FPSETMASK) CHECK_INCLUDE_FILES(gc/gc.h HAVE_GC_GC_H) CHECK_INCLUDE_FILES(gc.h HAVE_GC_H) CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY) -CHECK_FUNCTION_EXISTS(gtk_window_fullscreen HAVE_GTK_WINDOW_FULLSCREEN) -CHECK_FUNCTION_EXISTS(gtk_window_set_default_icon_from_file HAVE_GTK_WINDOW_SET_DEFAULT_ICON_FROM_FILE) CHECK_INCLUDE_FILES(ieeefp.h HAVE_IEEEFP_H) CHECK_INCLUDE_FILES(inttypes.h HAVE_INTTYPES_H) CHECK_INCLUDE_FILES(locale.h HAVE_LC_MESSAGES) -- cgit v1.2.3 From aca7362ca35917ae1c5c2ac12b8cd86120931b0d Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 14 Jun 2017 18:24:48 -0400 Subject: Remove checks for unused functions. --- CMakeScripts/ConfigChecks.cmake | 2 -- 1 file changed, 2 deletions(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/ConfigChecks.cmake b/CMakeScripts/ConfigChecks.cmake index bd01639ef..8d35071f3 100644 --- a/CMakeScripts/ConfigChecks.cmake +++ b/CMakeScripts/ConfigChecks.cmake @@ -31,7 +31,6 @@ CHECK_INCLUDE_FILES(malloc.h HAVE_MALLOC_H) CHECK_FUNCTION_EXISTS(memmove HAVE_MEMMOVE) CHECK_INCLUDE_FILES(memory.h HAVE_MEMORY_H) CHECK_FUNCTION_EXISTS(memset HAVE_MEMSET) -CHECK_FUNCTION_EXISTS(mkdir HAVE_MKDIR) CHECK_FUNCTION_EXISTS(pow HAVE_POW) CHECK_FUNCTION_EXISTS(sqrt HAVE_SQRT) CHECK_INCLUDE_FILES(stddef.h HAVE_STDDEF_H) @@ -39,7 +38,6 @@ CHECK_INCLUDE_FILES(stdint.h HAVE_STDINT_H) CHECK_INCLUDE_FILES(stdlib.h HAVE_STDLIB_H) CHECK_INCLUDE_FILES(strings.h HAVE_STRINGS_H) CHECK_INCLUDE_FILES(string.h HAVE_STRING_H) -CHECK_FUNCTION_EXISTS(strncasecmp HAVE_STRNCASECMP) CHECK_FUNCTION_EXISTS(strpbrk HAVE_STRPBRK) CHECK_FUNCTION_EXISTS(strrchr HAVE_STRRCHR) CHECK_FUNCTION_EXISTS(strspn HAVE_STRSPN) -- cgit v1.2.3 From c6627256555b3356238e57ffd749c413d28e8a3c Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 14 Jun 2017 19:40:37 -0400 Subject: Remove duplicated build checks. Most of these #defines are not even checked anyway, though they could have the side-effect of failing configure before the build started. However, these checks are redundant due to other checks for the same thing: * concept_check.hpp was added to Boost in 1.19.0, released in 2000. I sincerely doubt anyone is using that version right now, but I added a minimum version to the find_package() call. In any case, no code actually checked the #define, so it wouldn't have built without it anyway. * FindBoehmGC puts gc.h on the compiler search path, so there's no need to try gc/gc.h also. * libintl.h is found by FindIntl. * unordered_set is part of the C++11 standard. * zlib.h is found by find_package(ZLIB). --- CMakeScripts/ConfigChecks.cmake | 7 ------- CMakeScripts/DefineDependsandFlags.cmake | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/ConfigChecks.cmake b/CMakeScripts/ConfigChecks.cmake index 8d35071f3..dd90eab65 100644 --- a/CMakeScripts/ConfigChecks.cmake +++ b/CMakeScripts/ConfigChecks.cmake @@ -13,18 +13,14 @@ include(CheckStructHasMember) set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${INKSCAPE_LIBS}) set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${INKSCAPE_INCS_SYS}) -CHECK_INCLUDE_FILE_CXX(boost/concept_check.hpp HAVE_BOOST_CONCEPT_CHECK_HPP) CHECK_INCLUDE_FILES(cairo-pdf.h HAVE_CAIRO_PDF) CHECK_FUNCTION_EXISTS(floor HAVE_FLOOR) CHECK_FUNCTION_EXISTS(fpsetmask HAVE_FPSETMASK) -CHECK_INCLUDE_FILES(gc/gc.h HAVE_GC_GC_H) -CHECK_INCLUDE_FILES(gc.h HAVE_GC_H) CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY) CHECK_INCLUDE_FILES(ieeefp.h HAVE_IEEEFP_H) CHECK_INCLUDE_FILES(inttypes.h HAVE_INTTYPES_H) CHECK_INCLUDE_FILES(locale.h HAVE_LC_MESSAGES) CHECK_INCLUDE_FILES(locale.h HAVE_LOCALE_H) -CHECK_INCLUDE_FILES(libintl.h HAVE_LIBINTL_H) CHECK_INCLUDE_FILES(fcntl.h HAVE_FCNTL_H) CHECK_FUNCTION_EXISTS(mallinfo HAVE_MALLINFO) CHECK_INCLUDE_FILES(malloc.h HAVE_MALLOC_H) @@ -53,9 +49,6 @@ CHECK_INCLUDE_FILES(sys/stat.h HAVE_SYS_STAT_H) CHECK_INCLUDE_FILES(sys/time.h HAVE_SYS_TIME_H) CHECK_INCLUDE_FILES(sys/types.h HAVE_SYS_TYPES_H) CHECK_INCLUDE_FILES(unistd.h HAVE_UNISTD_H) -CHECK_INCLUDE_FILES(zlib.h HAVE_ZLIB_H) - -CHECK_INCLUDE_FILE_CXX(unordered_set HAVE_NATIVE_UNORDERED_SET) # Enable pango defines, necessary for compilation on Win32, how about Linux? # yes but needs to be done a better way diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 8cc0f0cd9..cfa5792aa 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -303,7 +303,7 @@ find_package(Freetype REQUIRED) list(APPEND INKSCAPE_INCS_SYS ${FREETYPE_INCLUDE_DIRS}) list(APPEND INKSCAPE_LIBS ${FREETYPE_LIBRARIES}) -find_package(Boost REQUIRED) +find_package(Boost 1.19.0 REQUIRED) list(APPEND INKSCAPE_INCS_SYS ${Boost_INCLUDE_DIRS}) # list(APPEND INKSCAPE_LIBS ${Boost_LIBRARIES}) -- cgit v1.2.3 From a3393654f6ec49e012f9c79e7350a087340c4468 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 14 Jun 2017 19:54:38 -0400 Subject: Remove cmake checks for C89 headers. These are roughly equivalent to autoconf's AC_HEADER_STDC and even they say that macro is obsolescent. strings.h is not really a C89 header, but it defined some things that are no longer needed [1]. And no file actually #includes it. [1] https://stackoverflow.com/a/4291328 --- CMakeScripts/ConfigChecks.cmake | 6 ------ 1 file changed, 6 deletions(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/ConfigChecks.cmake b/CMakeScripts/ConfigChecks.cmake index dd90eab65..b1e24fc08 100644 --- a/CMakeScripts/ConfigChecks.cmake +++ b/CMakeScripts/ConfigChecks.cmake @@ -19,8 +19,6 @@ CHECK_FUNCTION_EXISTS(fpsetmask HAVE_FPSETMASK) CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY) CHECK_INCLUDE_FILES(ieeefp.h HAVE_IEEEFP_H) CHECK_INCLUDE_FILES(inttypes.h HAVE_INTTYPES_H) -CHECK_INCLUDE_FILES(locale.h HAVE_LC_MESSAGES) -CHECK_INCLUDE_FILES(locale.h HAVE_LOCALE_H) CHECK_INCLUDE_FILES(fcntl.h HAVE_FCNTL_H) CHECK_FUNCTION_EXISTS(mallinfo HAVE_MALLINFO) CHECK_INCLUDE_FILES(malloc.h HAVE_MALLOC_H) @@ -29,11 +27,7 @@ CHECK_INCLUDE_FILES(memory.h HAVE_MEMORY_H) CHECK_FUNCTION_EXISTS(memset HAVE_MEMSET) CHECK_FUNCTION_EXISTS(pow HAVE_POW) CHECK_FUNCTION_EXISTS(sqrt HAVE_SQRT) -CHECK_INCLUDE_FILES(stddef.h HAVE_STDDEF_H) CHECK_INCLUDE_FILES(stdint.h HAVE_STDINT_H) -CHECK_INCLUDE_FILES(stdlib.h HAVE_STDLIB_H) -CHECK_INCLUDE_FILES(strings.h HAVE_STRINGS_H) -CHECK_INCLUDE_FILES(string.h HAVE_STRING_H) CHECK_FUNCTION_EXISTS(strpbrk HAVE_STRPBRK) CHECK_FUNCTION_EXISTS(strrchr HAVE_STRRCHR) CHECK_FUNCTION_EXISTS(strspn HAVE_STRSPN) -- cgit v1.2.3 From 9558bbd1040b29e65e3f2cf20b2ce2347be30f0e Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 14 Jun 2017 20:08:40 -0400 Subject: Remove cmake checks for unused sys/ headers. Nothing tests these macros nor includes these files, so I don't think there's any useful side-effect for checking that they exist. --- CMakeScripts/ConfigChecks.cmake | 1 - 1 file changed, 1 deletion(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/ConfigChecks.cmake b/CMakeScripts/ConfigChecks.cmake index b1e24fc08..04c077026 100644 --- a/CMakeScripts/ConfigChecks.cmake +++ b/CMakeScripts/ConfigChecks.cmake @@ -38,7 +38,6 @@ CHECK_STRUCT_HAS_MEMBER(fsmblks mallinfo malloc.h HAVE_STRUCT_MALLINFO_FSMBLKS) CHECK_STRUCT_HAS_MEMBER(hblkhd mallinfo malloc.h HAVE_STRUCT_MALLINFO_HBLKHD) CHECK_STRUCT_HAS_MEMBER(uordblks mallinfo malloc.h HAVE_STRUCT_MALLINFO_UORDBLKS) CHECK_STRUCT_HAS_MEMBER(usmblks mallinfo malloc.h HAVE_STRUCT_MALLINFO_USMBLKS) -CHECK_INCLUDE_FILES(sys/filio.h HAVE_SYS_FILIO_H) CHECK_INCLUDE_FILES(sys/stat.h HAVE_SYS_STAT_H) CHECK_INCLUDE_FILES(sys/time.h HAVE_SYS_TIME_H) CHECK_INCLUDE_FILES(sys/types.h HAVE_SYS_TYPES_H) -- cgit v1.2.3 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 From 1ae3f163d838e5cc20d0991018a141b5cc1a6a31 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 14 Jun 2017 21:39:04 -0400 Subject: Remove cmake checks for unused libraries. Neither gthread nor FreeType appear to be used for anything. --- CMakeScripts/DefineDependsandFlags.cmake | 5 ----- 1 file changed, 5 deletions(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 6967e8149..52410fb2b 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -45,7 +45,6 @@ pkg_check_modules(INKSCAPE_DEP REQUIRED pangocairo pangoft2 fontconfig - gthread-2.0 gsl gmodule-2.0) @@ -287,10 +286,6 @@ set(TRY_GTKSPELL ON) ${GTKSPELL3_LIBRARIES} ) -find_package(Freetype REQUIRED) -list(APPEND INKSCAPE_INCS_SYS ${FREETYPE_INCLUDE_DIRS}) -list(APPEND INKSCAPE_LIBS ${FREETYPE_LIBRARIES}) - find_package(Boost 1.19.0 REQUIRED) list(APPEND INKSCAPE_INCS_SYS ${Boost_INCLUDE_DIRS}) # list(APPEND INKSCAPE_LIBS ${Boost_LIBRARIES}) -- cgit v1.2.3 From 2cf0d896e314d46767ec2c0f7e2734473f523490 Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Thu, 15 Jun 2017 21:45:48 +0200 Subject: Refactor 1a66c0aae0da7c3b860d06e72f5ff87f444bc462 and allow to use a different data directory by setting the environment variable INKSCAPE_DATADIR at runtime --- CMakeScripts/ConfigPaths.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/ConfigPaths.cmake b/CMakeScripts/ConfigPaths.cmake index de053c4d8..f62d14c4e 100644 --- a/CMakeScripts/ConfigPaths.cmake +++ b/CMakeScripts/ConfigPaths.cmake @@ -7,7 +7,7 @@ if(WIN32) endif() set(INKSCAPE_LIBDIR "\\\\lib") - set(INKSCAPE_DATADIR "") + set(INKSCAPE_DATADIR "") # can be set via the evironment variable INKSCAPE_DATADIR at runtime set(PACKAGE_LOCALE_DIR "\\\\share\\\\locale") -- cgit v1.2.3 From f836a482511f299034e84f2e153f31698904f92b Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Thu, 22 Jun 2017 23:51:00 +0200 Subject: cmake/MSYS2: quick fix for poppler update --- CMakeScripts/InstallMSYS2.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake index 89643a01a..65ced10e2 100644 --- a/CMakeScripts/InstallMSYS2.cmake +++ b/CMakeScripts/InstallMSYS2.cmake @@ -84,7 +84,7 @@ if(WIN32) ${MINGW_BIN}/libplc4.dll ${MINGW_BIN}/libplds4.dll ${MINGW_BIN}/libpng16-16.dll - ${MINGW_BIN}/libpoppler-66.dll + ${MINGW_BIN}/libpoppler-67.dll ${MINGW_BIN}/libpoppler-glib-8.dll ${MINGW_BIN}/libpopt-0.dll ${MINGW_BIN}/libpotrace-0.dll -- cgit v1.2.3