diff options
| author | Christian Dywan <christian.dywan@canonical.com> | 2013-10-28 22:49:29 +0100 |
|---|---|---|
| committer | Christian Dywan <christian.dywan@canonical.com> | 2013-10-28 22:49:29 +0100 |
| commit | 8fa7a6b6a8353673e3ab229a68aa6edf711faa5b (patch) | |
| tree | af9da74f37598a6c80d14b70c5940950e629280b /CMakeLists.txt | |
| parent | 9fcf4f455022fec8632dfaa157879897aee35637 (diff) | |
| download | midori-git-8fa7a6b6a8353673e3ab229a68aa6edf711faa5b.tar.gz | |
Only enable HAVE_LIBSOUP_2_40_0 in Vala for 0.18 and later
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8cc4f37d..fa0199b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,6 +30,13 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) # Disallow building during install to avoid permission problems set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY 1) +find_package(Vala REQUIRED) +vala_require("0.16.0") +set(VALAFLAGS ${VALAFLAGS} + --enable-deprecated + --debug + ) + include(GNUInstallDirs) set(DATADIR ${CMAKE_INSTALL_FULL_DATADIR}) add_definitions("-DMDATADIR=\"${DATADIR}\"") @@ -116,7 +123,11 @@ if (${DEPS_libsoup-gnome-2.4_VERSION} VERSION_GREATER "2.37.1") endif () if (${DEPS_libsoup-gnome-2.4_VERSION} VERSION_GREATER "2.40.0") add_definitions("-DHAVE_LIBSOUP_2_40_0") - set(VALAFLAGS ${VALAFLAGS} -D HAVE_LIBSOUP_2_40_0) + # valac 0.16 didn't have the bindings yet + message(STATUS "vala: ${VALA_VERSION}") + if (${VALA_VERSION} VERSION_GREATER "0.17.0") + set(VALAFLAGS ${VALAFLAGS} -D HAVE_LIBSOUP_2_40_0) + endif () endif () if (WIN32) @@ -213,13 +224,6 @@ else () set(EXTRA_VAPIS ${EXTRA_VAPIS} "${CMAKE_SOURCE_DIR}/midori/webkitgtk-3.0.vapi") endif () -find_package(Vala REQUIRED) -vala_require("0.16.0") -set(VALAFLAGS ${VALAFLAGS} - --enable-deprecated - --debug - ) - # dh_translations detects this if there's no variable used set (GETTEXT_PACKAGE "midori") add_definitions("-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\"") |