aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarvin W <git@larma.de>2017-03-23 20:06:00 +0100
committerMarvin W <git@larma.de>2017-03-23 20:06:00 +0100
commit5862e253377a5d6259dfa6a8cc0731f2f7028830 (patch)
tree77283d2f8d572d2055e556e78604a3ec31bb673a
parentc95a4009081eeafb76670b31416f0e76c511c3e7 (diff)
downloaddino-5862e253377a5d6259dfa6a8cc0731f2f7028830.tar.gz
dino-5862e253377a5d6259dfa6a8cc0731f2f7028830.zip
Find valac-* binaries, work-around fast-vapi issues with valac 0.36.0
-rw-r--r--CMakeLists.txt5
-rw-r--r--cmake/FindVala.cmake2
-rwxr-xr-xconfigure2
3 files changed, 8 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 229abfce..0a6eab42 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,6 +67,11 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
find_package(Vala 0.30 REQUIRED)
+if(VALA_VERSION VERSION_EQUAL "0.36.0")
+ # Due to a bug on 0.36.0, we need to disable FAST_VAPI
+ set(DISABLE_FAST_VAPI yes)
+endif()
+
include(${VALA_USE_FILE})
include(MultiFind)
include(GlibCompileResourcesSupport)
diff --git a/cmake/FindVala.cmake b/cmake/FindVala.cmake
index 371daaf5..5b35d7d7 100644
--- a/cmake/FindVala.cmake
+++ b/cmake/FindVala.cmake
@@ -47,7 +47,7 @@
# Search for the valac executable in the usual system paths
# Some distributions rename the valac to contain the major.minor in the binary name
find_package(GObject REQUIRED)
-find_program(VALA_EXECUTABLE NAMES valac valac-0.20 valac-0.18 valac-0.16 valac-0.14 valac-0.12 valac-0.10)
+find_program(VALA_EXECUTABLE NAMES valac valac-0.36 valac-0.34 valac-0.32 valac-0.30)
mark_as_advanced(VALA_EXECUTABLE)
# Determine the valac version
diff --git a/configure b/configure
index 4563a9f5..58293e2e 100755
--- a/configure
+++ b/configure
@@ -32,6 +32,8 @@ Options:
--valac=VALAC Use VALAC as Vala pre-compiler. [$VALA_EXECUTABLE]
--valac-flags=FLAGS Use FLAGS when invoking the vala compiler
--disable-fast-vapi Disable the usage of Vala compilers fast-vapi feature.
+ fast-vapi mode is slower when doing clean builds, but
+ faster when doing incremental builds (during development)
--fetch-only Only fetch the files required to run ./configure without
network access later and exit