diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2016-04-12 17:12:47 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marcjeanmougin@free.fr> | 2016-04-12 17:12:47 +0000 |
| commit | d97964973f051d4ee5f9adf14997961142393420 (patch) | |
| tree | 77a4d1382b7f3a2ed632e6f05fddfcbd6dfd6805 /CMakeScripts/DefineDependsandFlags.cmake | |
| parent | Fork GtkImageMenuItem and remove show_image boolean because we always want to... (diff) | |
| download | inkscape-d97964973f051d4ee5f9adf14997961142393420.tar.gz inkscape-d97964973f051d4ee5f9adf14997961142393420.zip | |
Fix some cmake caching issue preventing to switch between gtk{2,3} builds
(bzr r14801)
Diffstat (limited to 'CMakeScripts/DefineDependsandFlags.cmake')
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 054c08a74..d8088bf9a 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -210,7 +210,7 @@ set(TRY_GTKSPELL 1) # use patched version until GTK2_CAIROMMCONFIG_INCLUDE_DIR is added if("${WITH_GTK3_EXPERIMENTAL}") pkg_check_modules( - GTK + GTK3 REQUIRED gtkmm-3.0>=3.8 gdkmm-3.0>=3.8 @@ -219,7 +219,7 @@ if("${WITH_GTK3_EXPERIMENTAL}") gdl-3.0>=3.4 ) message("Using EXPERIMENTAL Gtkmm 3 build") - list(APPEND INKSCAPE_CXX_FLAGS ${GTK_CFLAGS_OTHER}) + list(APPEND INKSCAPE_CXX_FLAGS ${GTK3_CFLAGS_OTHER}) set(WITH_GTKMM_3_0 1) message("Using external GDL") set(WITH_EXT_GDL 1) @@ -251,12 +251,12 @@ if("${WITH_GTK3_EXPERIMENTAL}") set (WITH_GTKSPELL 1) endif() list(APPEND INKSCAPE_INCS_SYS - ${GTK_INCLUDE_DIRS} + ${GTK3_INCLUDE_DIRS} ${GTKSPELL3_INCLUDE_DIRS} ) list(APPEND INKSCAPE_LIBS - ${GTK_LIBRARIES} + ${GTK3_LIBRARIES} ${GTKSPELL3_LIBRARIES} ) else() |