[llvm-branch-commits] [llvm-branch] r229567 - Merging r229529:

[Hans Wennborg]

Author: hans
Date: Tue Feb 17 16:11:36 2015
New Revision: 229567

URL: http://llvm.org/viewvc/llvm-project?rev=229567&view=rev
Log:
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().
------------------------------------------------------------------------

Modified:
    llvm/branches/release_36/   (props changed)
    llvm/branches/release_36/include/llvm/Config/config.h.cmake
    llvm/branches/release_36/include/llvm/Config/llvm-config.h.cmake
    llvm/branches/release_36/include/llvm/Config/llvm-config.h.in

Propchange: llvm/branches/release_36/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 17 16:11:36 2015
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,226023,226029,226044,226046,226048,226058,226075,226170-226171,226182,226473,226588,226616,226664,226708,226711,226755,226791,226808-226809,227005,227085,227250,227260-227261,227290,227294,227299,227319,227339,227491,227584,227603,227628,227670,227809,227815,227903,227934,227972,227983,228049,228129,228168,228331,228411,228444,228490,228500,228507,228518,228525,228565,228656,228760-228761,228793,228842,228899,228957,228969,228979,229029,229343,229351,229421,229495
+/llvm/trunk:155241,226023,226029,226044,226046,226048,226058,226075,226170-226171,226182,226473,226588,226616,226664,226708,226711,226755,226791,226808-226809,227005,227085,227250,227260-227261,227290,227294,227299,227319,227339,227491,227584,227603,227628,227670,227809,227815,227903,227934,227972,227983,228049,228129,228168,228331,228411,228444,228490,228500,228507,228518,228525,228565,228656,228760-228761,228793,228842,228899,228957,228969,228979,229029,229343,229351,229421,229495,229529

Modified: llvm/branches/release_36/include/llvm/Config/config.h.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_36/include/llvm/Config/config.h.cmake?rev=229567&r1=229566&r2=229567&view=diff
==============================================================================
--- llvm/branches/release_36/include/llvm/Config/config.h.cmake (original)
+++ llvm/branches/release_36/include/llvm/Config/config.h.cmake Tue Feb 17 16:11:36 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/branches/release_36/include/llvm/Config/llvm-config.h.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_36/include/llvm/Config/llvm-config.h.cmake?rev=229567&r1=229566&r2=229567&view=diff
==============================================================================
--- llvm/branches/release_36/include/llvm/Config/llvm-config.h.cmake (original)
+++ llvm/branches/release_36/include/llvm/Config/llvm-config.h.cmake Tue Feb 17 16:11:36 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/branches/release_36/include/llvm/Config/llvm-config.h.in
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_36/include/llvm/Config/llvm-config.h.in?rev=229567&r1=229566&r2=229567&view=diff
==============================================================================
--- llvm/branches/release_36/include/llvm/Config/llvm-config.h.in (original)
+++ llvm/branches/release_36/include/llvm/Config/llvm-config.h.in Tue Feb 17 16:11:36 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