From b532d221686e7c7b1c0e3e272faae2236c14d24a Mon Sep 17 00:00:00 2001 From: Radovan Bast Date: Thu, 8 Oct 2015 10:01:49 +0200 Subject: [PATCH] protect FC/CC/CXX exports in quotes to allow ccache; fixes #149 --- modules/cc.cmake | 4 ++-- modules/cxx.cmake | 4 ++-- modules/fc.cmake | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/cc.cmake b/modules/cc.cmake index 589d75b..100efa4 100644 --- a/modules/cc.cmake +++ b/modules/cc.cmake @@ -21,8 +21,8 @@ # # docopt: --cc= C compiler [default: gcc]. # --extra-cc-flags= Extra C compiler flags [default: '']. -# export: 'CC=%s' % arguments['--cc'] -# define: '-DEXTRA_CFLAGS="%s"' % arguments['--extra-cc-flags'] +# export: 'CC="{0}"'.format(arguments['--cc']) +# define: '-DEXTRA_CFLAGS="{0}"'.format(arguments['--extra-cc-flags']) enable_language(C) diff --git a/modules/cxx.cmake b/modules/cxx.cmake index a050b2f..76bb40f 100644 --- a/modules/cxx.cmake +++ b/modules/cxx.cmake @@ -21,8 +21,8 @@ # # docopt: --cxx= C++ compiler [default: g++]. # --extra-cxx-flags= Extra C++ compiler flags [default: '']. -# export: 'CXX=%s' % arguments['--cxx'] -# define: '-DEXTRA_CXXFLAGS="%s"' % arguments['--extra-cxx-flags'] +# export: 'CXX="{0}"'.format(arguments['--cxx']) +# define: '-DEXTRA_CXXFLAGS="{0}"'.format(arguments['--extra-cxx-flags']) enable_language(CXX) diff --git a/modules/fc.cmake b/modules/fc.cmake index 7169e7d..634aa33 100644 --- a/modules/fc.cmake +++ b/modules/fc.cmake @@ -25,8 +25,8 @@ # # docopt: --fc= Fortran compiler [default: gfortran]. # --extra-fc-flags= Extra Fortran compiler flags [default: '']. -# export: 'FC=%s' % arguments['--fc'] -# define: '-DEXTRA_FCFLAGS="%s"' % arguments['--extra-fc-flags'] +# export: 'FC="{0}"'.format(arguments['--fc']) +# define: '-DEXTRA_FCFLAGS="{0}"'.format(arguments['--extra-fc-flags']) enable_language(Fortran)