<div dir="ltr">We should merge this, since providing this version macro will be useful for others in the future.</div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Feb 17, 2015 at 12:02 PM, Reid Kleckner <span dir="ltr"><<a href="mailto:reid@kleckner.net" target="_blank">reid@kleckner.net</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rnk<br>
Date: Tue Feb 17 14:02:34 2015<br>
New Revision: 229529<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=229529&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=229529&view=rev</a><br>
Log:<br>
Expose LLVM_VERSION_PATCH in llvm-config.h<br>
<br>
There was no reason to keep this private in config.h, and users<br>
requested that it be available in PR22615.<br>
<br>
Also fix a bug where patch versions of '0' would cause the macro to<br>
remain undefined. The "#cmakedefine" command only creates a macro if the<br>
named variable would be considered true in the context of an if().<br>
<br>
Modified:<br>
    llvm/trunk/include/llvm/Config/config.h.cmake<br>
    llvm/trunk/include/llvm/Config/llvm-config.h.cmake<br>
    llvm/trunk/include/llvm/Config/<a href="http://llvm-config.h.in" target="_blank">llvm-config.h.in</a><br>
<br>
Modified: llvm/trunk/include/llvm/Config/config.h.cmake<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Config/config.h.cmake?rev=229529&r1=229528&r2=229529&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Config/config.h.cmake?rev=229529&r1=229528&r2=229529&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/Config/config.h.cmake (original)<br>
+++ llvm/trunk/include/llvm/Config/config.h.cmake Tue Feb 17 14:02:34 2015<br>
@@ -6,9 +6,6 @@<br>
 /* Exported configuration */<br>
 #include "llvm/Config/llvm-config.h"<br>
<br>
-/* Patch version of the LLVM API */<br>
-#cmakedefine LLVM_VERSION_PATCH ${LLVM_VERSION_PATCH}<br>
-<br>
 /* Bug report URL. */<br>
 #define BUG_REPORT_URL "${BUG_REPORT_URL}"<br>
<br>
<br>
Modified: llvm/trunk/include/llvm/Config/llvm-config.h.cmake<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Config/llvm-config.h.cmake?rev=229529&r1=229528&r2=229529&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Config/llvm-config.h.cmake?rev=229529&r1=229528&r2=229529&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/Config/llvm-config.h.cmake (original)<br>
+++ llvm/trunk/include/llvm/Config/llvm-config.h.cmake Tue Feb 17 14:02:34 2015<br>
@@ -87,10 +87,13 @@<br>
 #cmakedefine LLVM_USE_OPROFILE 1<br>
<br>
 /* Major version of the LLVM API */<br>
-#cmakedefine LLVM_VERSION_MAJOR ${LLVM_VERSION_MAJOR}<br>
+#define LLVM_VERSION_MAJOR ${LLVM_VERSION_MAJOR}<br>
<br>
 /* Minor version of the LLVM API */<br>
-#cmakedefine LLVM_VERSION_MINOR ${LLVM_VERSION_MINOR}<br>
+#define LLVM_VERSION_MINOR ${LLVM_VERSION_MINOR}<br>
+<br>
+/* Patch version of the LLVM API */<br>
+#define LLVM_VERSION_PATCH ${LLVM_VERSION_PATCH}<br>
<br>
 /* LLVM version string */<br>
 #define LLVM_VERSION_STRING "${PACKAGE_VERSION}"<br>
<br>
Modified: llvm/trunk/include/llvm/Config/<a href="http://llvm-config.h.in" target="_blank">llvm-config.h.in</a><br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Config/llvm-config.h.in?rev=229529&r1=229528&r2=229529&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Config/llvm-config.h.in?rev=229529&r1=229528&r2=229529&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/Config/<a href="http://llvm-config.h.in" target="_blank">llvm-config.h.in</a> (original)<br>
+++ llvm/trunk/include/llvm/Config/<a href="http://llvm-config.h.in" target="_blank">llvm-config.h.in</a> Tue Feb 17 14:02:34 2015<br>
@@ -92,6 +92,9 @@<br>
 /* Minor version of the LLVM API */<br>
 #undef LLVM_VERSION_MINOR<br>
<br>
+/* Patch version of the LLVM API */<br>
+#undef LLVM_VERSION_PATCH<br>
+<br>
 /* LLVM version string */<br>
 #undef LLVM_VERSION_STRING<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>