anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Find valac-* binaries, work-around fast-vapi issues with valac 0.36.0

Browse source
This commit is contained in:
Marvin W 2017-03-23 20:06:00 +01:00
parent c95a400908
commit 5862e25337
No known key found for this signature in database
GPG key ID: 072E9235DB996F2A
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -67,6 +67,11 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
find_package(Vala 0.30 REQUIRED) 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(${VALA_USE_FILE})
include(MultiFind) include(MultiFind)
include(GlibCompileResourcesSupport) include(GlibCompileResourcesSupport)

2
cmake/FindVala.cmake
View file

@ -47,7 +47,7 @@
# Search for the valac executable in the usual system paths # Search for the valac executable in the usual system paths
# Some distributions rename the valac to contain the major.minor in the binary name # Some distributions rename the valac to contain the major.minor in the binary name
find_package(GObject REQUIRED) 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) mark_as_advanced(VALA_EXECUTABLE)
# Determine the valac version # Determine the valac version

2
configure vendored
View file

@ -32,6 +32,8 @@ Options:
--valac=VALAC Use VALAC as Vala pre-compiler. [$VALA_EXECUTABLE] --valac=VALAC Use VALAC as Vala pre-compiler. [$VALA_EXECUTABLE]
--valac-flags=FLAGS Use FLAGS when invoking the vala compiler --valac-flags=FLAGS Use FLAGS when invoking the vala compiler
--disable-fast-vapi Disable the usage of Vala compilers fast-vapi feature. --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 --fetch-only Only fetch the files required to run ./configure without
network access later and exit network access later and exit