diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2016-04-13 11:58:08 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marcjeanmougin@free.fr> | 2016-04-13 11:58:08 +0000 |
| commit | 16b2c93dcfca8c6ee6cd61f4065a9a387fcde3bd (patch) | |
| tree | 7abcf58b8b0e63126f5c716f03fc01aee447cc43 /CMakeScripts | |
| parent | Fix referencing problem with widget is moved from one container to another. H... (diff) | |
| download | inkscape-16b2c93dcfca8c6ee6cd61f4065a9a387fcde3bd.tar.gz inkscape-16b2c93dcfca8c6ee6cd61f4065a9a387fcde3bd.zip | |
Fix CMake caching issue with GtkSpell
(bzr r14823)
Diffstat (limited to 'CMakeScripts')
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index d8088bf9a..4429758c0 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -247,9 +247,12 @@ if("${WITH_GTK3_EXPERIMENTAL}") pkg_check_modules(GTKSPELL3 gtkspell3-3.0) if("${GTKSPELL3_FOUND}") - message("Using GtkSpell3 3.0") + message("Using GtkSpell3") set (WITH_GTKSPELL 1) + else() + unset(WITH_GTKSPELL) endif() + list(APPEND INKSCAPE_INCS_SYS ${GTK3_INCLUDE_DIRS} ${GTKSPELL3_INCLUDE_DIRS} @@ -268,19 +271,21 @@ else() ) list(APPEND INKSCAPE_CXX_FLAGS ${GTK_CFLAGS_OTHER}) pkg_check_modules(GTKSPELL2 gtkspell-2.0) - if("${GTKSPELL3_FOUND}") - message("Using GtkSpell3 3.0") - add_definitions(${GTK_CFLAGS_OTHER}) + if("${GTKSPELL2_FOUND}") + message("Using GtkSpell 2") + add_definitions(${GTKSPELL2_CFLAGS_OTHER}) set (WITH_GTKSPELL 1) + else() + unset(WITH_GTKSPELL) endif() list(APPEND INKSCAPE_INCS_SYS ${GTK_INCLUDE_DIRS} - ${GTKSPELL_INCLUDE_DIRS} + ${GTKSPELL2_INCLUDE_DIRS} ) list(APPEND INKSCAPE_LIBS ${GTK_LIBRARIES} - ${GTKSPELL_LIBRARIES} + ${GTKSPELL2_LIBRARIES} ) endif() @@ -300,17 +305,6 @@ if(ASPELL_FOUND) set(HAVE_ASPELL TRUE) endif() -if("${TRY_GTKSPELL}" AND "${WITH_GTKSPELL}") - find_package(GtkSpell) - if(GTKSPELL_FOUND) - list(APPEND INKSCAPE_INCS_SYS ${GTKSPELL_INCLUDE_DIR}) - list(APPEND INKSCAPE_LIBS ${GTKSPELL_LIBRARIES}) - add_definitions(${GTKSPELL_DEFINITIONS}) - else() - set(WITH_GTKSPELL OFF) - endif() -endif() - #find_package(OpenSSL) #list(APPEND INKSCAPE_INCS_SYS ${OPENSSL_INCLUDE_DIR}) #list(APPEND INKSCAPE_LIBS ${OPENSSL_LIBRARIES}) |