nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Build support broken when "+" in path name: Closes #5609

Browse source
This commit is contained in:
Didier Roche 2012-08-04 11:37:19 +01:00 • committed by Jim Nelson
parent 0ff3d1addf
commit 5a455dbe30
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
THANKS
View file

@ -6,6 +6,7 @@ Christian Dywan <christian@twotoasts.de>
Timo Kluck <tkluck@infty.nl>
Charles Lindsay <chaz@yorba.org>
Mario Sanchez Prada <msanchez@igalia.com>
Didier Roche <didrocks@ubuntu.com>
Michel Alexandre Salim <salimma@fedoraproject.org>
Robert Schroll <rschroll@gmail.com>

10
cmake/ValaPrecompile.cmake
View file

@ -152,11 +152,15 @@ macro(vala_precompile output source_bundle_name)
set(custom_vapi_arguments "")
if(ARGS_CUSTOM_VAPIS)
foreach(vapi ${ARGS_CUSTOM_VAPIS})
if(${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR})
SET(_srcdir_regexp "${CMAKE_SOURCE_DIR}")
SET(_bindir_regexp "${CMAKE_BINARY_DIR}")
STRING(REGEX REPLACE "\\+" "\\\\+" _srcdir_regexp "${_srcdir_regexp}")
STRING(REGEX REPLACE "\\+" "\\\\+" _bindir_regexp "${_bindir_regexp}")
if(${vapi} MATCHES ${_srcdir_regexp} OR ${vapi} MATCHES ${_bindir_regexp})
list(APPEND custom_vapi_arguments ${vapi})
else(${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR})
else(${vapi} MATCHES ${_srcdir_regexp} OR ${vapi} MATCHES ${_bindir_regexp})
list(APPEND custom_vapi_arguments ${CMAKE_CURRENT_SOURCE_DIR}/${vapi})
endif(${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR})
endif(${vapi} MATCHES ${_srcdir_regexp} OR ${vapi} MATCHES ${_bindir_regexp})
endforeach(vapi ${ARGS_CUSTOM_VAPIS})
endif(ARGS_CUSTOM_VAPIS)