<div dir="ltr"><span style="font-size:12.8px">CLANG_APPEND_VC_REV doesn't appear to be checked anywhere. Were the two ifs supposed to check it instead of SVN_VERSION? The way it is now if the first if body executes, the second if does too since add_version_info_from_vcs sets SVN_VERSION and thus satisfies the second if.</span></div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Jan 18, 2016 at 6:06 AM, Daniel Sanders via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Thanks, that did the trick. I've removed the workaround from LLVMLinux.<br>
<span class="im HOEnZb"><br>
> -----Original Message-----<br>
> From: <a href="mailto:cbieneman@apple.com">cbieneman@apple.com</a> [mailto:<a href="mailto:cbieneman@apple.com">cbieneman@apple.com</a>] On Behalf Of<br>
> Chris Bieneman<br>
</span><span class="im HOEnZb">> Sent: 15 January 2016 17:55<br>
> To: Daniel Sanders<br>
> Cc: <a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
> Subject: Re: r257827 - [CMake] Set SVN_REVISION if<br>
> CLANG_APPEND_VC_REV=On<br>
><br>
</span><div class="HOEnZb"><div class="h5">> Thanks for the heads up. It looks like that module is was excluded from the<br>
> LLVM install. I’ve changed that in LLVM r257909. That change should resolve<br>
> your build issue. Please let me know if you continue having problems.<br>
><br>
> Thanks,<br>
> -Chris<br>
><br>
> > On Jan 15, 2016, at 5:18 AM, Daniel Sanders <<a href="mailto:Daniel.Sanders@imgtec.com">Daniel.Sanders@imgtec.com</a>><br>
> wrote:<br>
> ><br>
> > Hi Chris,<br>
> ><br>
> > This doesn't seem to work when building clang separately from llvm.<br>
> LLVMLinux fails to build clang with:<br>
> > CMake Error at CMakeLists.txt:104 (include):<br>
> > include could not find load file:<br>
> ><br>
> > VersionFromVCS<br>
> ><br>
> > CMake Error at CMakeLists.txt:222 (add_version_info_from_vcs):<br>
> > Unknown CMake command "add_version_info_from_vcs".<br>
> > See<br>
> <a href="http://buildbot.llvm.linuxfoundation.org/builders/13_malta/builds/383/step" rel="noreferrer" target="_blank">http://buildbot.llvm.linuxfoundation.org/builders/13_malta/builds/383/step</a><br>
> s/shell_3/logs/stdio for the full log.<br>
> ><br>
> > I've added a patch to llvmlinux to work around the problem for now<br>
> <a href="http://git.linuxfoundation.org/?p=llvmlinux.git;a=blob;f=toolchain/clang/pat" rel="noreferrer" target="_blank">http://git.linuxfoundation.org/?p=llvmlinux.git;a=blob;f=toolchain/clang/pat</a><br>
> ches/clang/workaround-<br>
> versionfromvcsbug.patch;h=848a096df37b1255575650680a266234f5d4936e;h<br>
> b=e0c4c72c5a008006dc230db748ea69e0d1518daf.<br>
> > Should we make that change to clang or fix it another way?<br>
> ><br>
> >> -----Original Message-----<br>
> >> From: cfe-commits [mailto:<a href="mailto:cfe-commits-bounces@lists.llvm.org">cfe-commits-bounces@lists.llvm.org</a>] On<br>
> Behalf<br>
> >> Of Chris Bieneman via cfe-commits<br>
> >> Sent: 14 January 2016 22:45<br>
> >> To: <a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
> >> Subject: r257827 - [CMake] Set SVN_REVISION if<br>
> >> CLANG_APPEND_VC_REV=On<br>
> >><br>
> >> Author: cbieneman<br>
> >> Date: Thu Jan 14 16:45:12 2016<br>
> >> New Revision: 257827<br>
> >><br>
> >> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=257827&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=257827&view=rev</a><br>
> >> Log:<br>
> >> [CMake] Set SVN_REVISION if CLANG_APPEND_VC_REV=On<br>
> >><br>
> >> This matches autoconf's ability to put clang revisions in the clang --version<br>
> >> spew.<br>
> >><br>
> >> Modified:<br>
> >> cfe/trunk/CMakeLists.txt<br>
> >><br>
> >> Modified: cfe/trunk/CMakeLists.txt<br>
> >> URL: <a href="http://llvm.org/viewvc/llvm-" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-</a><br>
> >><br>
> project/cfe/trunk/CMakeLists.txt?rev=257827&r1=257826&r2=257827&view<br>
> >> =diff<br>
> >><br>
> ==========================================================<br>
> >> ====================<br>
> >> --- cfe/trunk/CMakeLists.txt (original)<br>
> >> +++ cfe/trunk/CMakeLists.txt Thu Jan 14 16:45:12 2016<br>
> >> @@ -101,6 +101,7 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR<br>
> >> include(AddLLVM)<br>
> >> include(TableGen)<br>
> >> include(HandleLLVMOptions)<br>
> >> + include(VersionFromVCS)<br>
> >><br>
> >> set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")<br>
> >><br>
> >> @@ -213,6 +214,18 @@ if(CLANG_REPOSITORY_STRING)<br>
> >> add_definitions(-<br>
> >> DCLANG_REPOSITORY_STRING="${CLANG_REPOSITORY_STRING}")<br>
> >> endif()<br>
> >><br>
> >> +option(CLANG_APPEND_VC_REV<br>
> >> + "Append the version control system revision id to clang version spew"<br>
> >> OFF)<br>
> >> +<br>
> >> +if(NOT SVN_REVISION)<br>
> >> + # This macro will set SVN_REVISION in the parent scope<br>
> >> + add_version_info_from_vcs(VERSION_VAR)<br>
> >> +endif()<br>
> >> +<br>
> >> +if(SVN_REVISION)<br>
> >> + add_definitions(-DSVN_REVISION="${SVN_REVISION}")<br>
> >> +endif()<br>
> >> +<br>
> >> set(CLANG_VENDOR_UTI "org.llvm.clang" CACHE STRING<br>
> >> "Vendor-specific uti.")<br>
> >><br>
> >><br>
> >><br>
> >> _______________________________________________<br>
> >> cfe-commits mailing list<br>
> >> <a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
> >> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</div></div></blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature">~Craig</div>
</div>