diff options
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | cmake/FindVala.cmake | 2 | ||||
| -rwxr-xr-x | configure | 2 |
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 @@ -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 |