[llvm] r229529 - Expose LLVM_VERSION_PATCH in llvm-config.h

[Reid Kleckner]

We should merge this, since providing this version macro will be useful for
others in the future.

On Tue, Feb 17, 2015 at 12:02 PM, Reid Kleckner <reid at kleckner.net> wrote:

> Author: rnk
> Date: Tue Feb 17 14:02:34 2015
> New Revision: 229529
>
> URL: http://llvm.org/viewvc/llvm-project?rev=229529&view=rev
> Log:
> Expose LLVM_VERSION_PATCH in llvm-config.h
>
> There was no reason to keep this private in config.h, and users
> requested that it be available in PR22615.
>
> Also fix a bug where patch versions of '0' would cause the macro to
> remain undefined. The "#cmakedefine" command only creates a macro if the
> named variable would be considered true in the context of an if().
>
> Modified:
>     llvm/trunk/include/llvm/Config/config.h.cmake
>     llvm/trunk/include/llvm/Config/llvm-config.h.cmake
>     llvm/trunk/include/llvm/Config/llvm-config.h.in
>
> Modified: llvm/trunk/include/llvm/Config/config.h.cmake
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Config/config.h.cmake?rev=229529&r1=229528&r2=229529&view=diff
>
> ==============================================================================
> --- llvm/trunk/include/llvm/Config/config.h.cmake (original)
> +++ llvm/trunk/include/llvm/Config/config.h.cmake Tue Feb 17 14:02:34 2015
> @@ -6,9 +6,6 @@
>  /* Exported configuration */
>  #include "llvm/Config/llvm-config.h"
>
> -/* Patch version of the LLVM API */
> -#cmakedefine LLVM_VERSION_PATCH ${LLVM_VERSION_PATCH}
> -
>  /* Bug report URL. */
>  #define BUG_REPORT_URL "${BUG_REPORT_URL}"
>
>
> Modified: llvm/trunk/include/llvm/Config/llvm-config.h.cmake
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Config/llvm-config.h.cmake?rev=229529&r1=229528&r2=229529&view=diff
>
> ==============================================================================
> --- llvm/trunk/include/llvm/Config/llvm-config.h.cmake (original)
> +++ llvm/trunk/include/llvm/Config/llvm-config.h.cmake Tue Feb 17 14:02:34
> 2015
> @@ -87,10 +87,13 @@
>  #cmakedefine LLVM_USE_OPROFILE 1
>
>  /* Major version of the LLVM API */
> -#cmakedefine LLVM_VERSION_MAJOR ${LLVM_VERSION_MAJOR}
> +#define LLVM_VERSION_MAJOR ${LLVM_VERSION_MAJOR}
>
>  /* Minor version of the LLVM API */
> -#cmakedefine LLVM_VERSION_MINOR ${LLVM_VERSION_MINOR}
> +#define LLVM_VERSION_MINOR ${LLVM_VERSION_MINOR}
> +
> +/* Patch version of the LLVM API */
> +#define LLVM_VERSION_PATCH ${LLVM_VERSION_PATCH}
>
>  /* LLVM version string */
>  #define LLVM_VERSION_STRING "${PACKAGE_VERSION}"
>
> Modified: llvm/trunk/include/llvm/Config/llvm-config.h.in
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Config/llvm-config.h.in?rev=229529&r1=229528&r2=229529&view=diff
>
> ==============================================================================
> --- llvm/trunk/include/llvm/Config/llvm-config.h.in (original)
> +++ llvm/trunk/include/llvm/Config/llvm-config.h.in Tue Feb 17 14:02:34
> 2015
> @@ -92,6 +92,9 @@
>  /* Minor version of the LLVM API */
>  #undef LLVM_VERSION_MINOR
>
> +/* Patch version of the LLVM API */
> +#undef LLVM_VERSION_PATCH
> +
>  /* LLVM version string */
>  #undef LLVM_VERSION_STRING
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150217/f1ecd86e/attachment.html>