Re: [LyX/master] pass git commit hash within CPPFLAGS to add it to version info

[Kornel Benko]

Am Freitag, 10. Oktober 2014 um 15:22:20, schrieb Kornel Benko <kor...@lyx.org>
> Am Freitag, 10. Oktober 2014 um 13:04:32, schrieb Stephan Witt 
> <st.w...@gmx.net>
> > Am 10.10.2014 um 12:17 schrieb Jean-Marc Lasgouttes <lasgout...@lyx.org>:
> >
> > > Le 10/10/2014 07:08, Stephan Witt a écrit :
> > >>> I am not sure whether it is worth having it in the start screen. This 
> > >>> is rather specialized information.
> > >
> > > What about the patch I just commited?
> > >
> > > Note that it needs a cmake counterpart, to define the new 
> > > LYX_GIT_COMMIT_HASH macro. I am also open to changing the wording.
> >
> > Cmake patch proposal: Ok to commit?
> >
> > Stephan
>
> I was already working on a cmake patch :(
>

1.) Missing in patch:
            if(LYX_GIT_VERSION)
   before use of "EXECUTE_PROCESS".
2.) use temporary variable for output of EXECUTE_PROCESS, like this

        set(LYX_GIT_COMMIT_HASH "none")
        ...

        EXECUTE_PROCESS(COMMAND ${LYX_GITVERSION} log -1 "--pretty=format:%H"
        WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE lyxgitcommit 
OUTPUT_STRIP_TRAILING_WHITESPACE)
        if (lyxgitcommit MATCHES "^[0-9a-f]+$")
        set(LYX_GIT_COMMIT_HASH ${lyxgitcommit})
  endif


        Kornel

signature.asc
Description: This is a digitally signed message part.