diff options
| author | Alexander Valavanis <valavanisalex@gmail.com> | 2018-03-04 19:15:02 +0000 |
|---|---|---|
| committer | Alexander Valavanis <valavanisalex@gmail.com> | 2018-03-04 19:15:02 +0000 |
| commit | f02b3a2d3a28b11f2d5e176f1e73187554a38a29 (patch) | |
| tree | f386448a802ddc2a6a34150788d6d160f964418c | |
| parent | Export to plotter via the parallel port (diff) | |
| download | inkscape-f02b3a2d3a28b11f2d5e176f1e73187554a38a29.tar.gz inkscape-f02b3a2d3a28b11f2d5e176f1e73187554a38a29.zip | |
Fix GTKMM version check macro
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 9 | ||||
| -rw-r--r-- | config.h.cmake | 13 |
2 files changed, 18 insertions, 4 deletions
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index ffaf833f0..a1ce9c16a 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -256,6 +256,15 @@ set(TRY_GTKSPELL ON) ) list(APPEND INKSCAPE_CXX_FLAGS ${GTK3_CFLAGS_OTHER}) + # Use some obtuse string parsing to get the version + # number components for GTKMM. + # These variables are also substituted in config.h, and used within the + # GTKMM_CHECK_VERSION macro + string(REPLACE "." ";" GTKMM_VERSION_COMPONENTS ${GTK3_gtkmm-3.0_VERSION}) + list(GET GTKMM_VERSION_COMPONENTS 0 INKSCAPE_GTKMM_MAJOR_VERSION) + list(GET GTKMM_VERSION_COMPONENTS 1 INKSCAPE_GTKMM_MINOR_VERSION) + list(GET GTKMM_VERSION_COMPONENTS 2 INKSCAPE_GTKMM_MICRO_VERSION) + pkg_check_modules(GDL_3_6 gdl-3.0>=3.6) if("${GDL_3_6_FOUND}") diff --git a/config.h.cmake b/config.h.cmake index 70422fafb..2979e64e2 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -225,6 +225,11 @@ /* Do we want experimental, unsupported, unguaranteed, etc., LivePathEffects enabled? */ #cmakedefine LPE_ENABLE_TEST_EFFECTS 1 +/* Local variables to store GTKMM version +#cmakedefine INKSCAPE_GTKMM_MAJOR_VERSION @INKSCAPE_GTKMM_MAJOR_VERSION@ +#cmakedefine INKSCAPE_GTKMM_MINOR_VERSION @INKSCAPE_GTKMM_MINOR_VERSION@ +#cmakedefine INKSCAPE_GTKMM_MICRO_VERSION @INKSCAPE_GTKMM_MICRO_VERSION@ + /** * Check GtkMM version * @@ -245,10 +250,10 @@ * Returns: %TRUE if GTK+ headers are new enough */ #define GTKMM_CHECK_VERSION(major,minor,micro) \ - (GTKMM_MAJOR_VERSION > (major) || \ - (GTKMM_MAJOR_VERSION == (major) && GTKMM_MINOR_VERSION > (minor)) || \ - (GTKMM_MAJOR_VERSION == (major) && GTKMM_MINOR_VERSION == (minor) && \ - GTKMM_MICRO_VERSION >= (micro))) + (INKSCAPE_GTKMM_MAJOR_VERSION > (major) || \ + (INKSCAPE_GTKMM_MAJOR_VERSION == (major) && INKSCAPE_GTKMM_MINOR_VERSION > (minor)) || \ + (INKSCAPE_GTKMM_MAJOR_VERSION == (major) && INKSCAPE_GTKMM_MINOR_VERSION == (minor) && \ + INKSCAPE_GTKMM_MICRO_VERSION >= (micro))) #endif /* _CONFIG_H_ */ |