Commit 53708497 authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging r229529: 

------------------------------------------------------------------------
r229529 | rnk | 2015-02-17 12:02:34 -0800 (Tue, 17 Feb 2015) | 8 lines

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().
------------------------------------------------------------------------

llvm-svn: 229567
parent 378df91b

llvm/include/llvm/Config/config.h.cmake

+0 −3
Original line number Diff line number Diff line
@@ -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}"

llvm/include/llvm/Config/llvm-config.h.cmake

+5 −2
Original line number Diff line number Diff line
@@ -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}"

llvm/include/llvm/Config/llvm-config.h.in

+3 −0
Original line number Diff line number Diff line
@@ -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