| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 1 | libc++ also has a file called version and this file and how cflags are specified |
| 2 | it ends up including this file and resulting in compile errors |
| 3 | |
| 4 | fixes errors like |
| 5 | storage/mroonga/version:1:1: error: expected unqualified-id |
| 6 | 7.07 |
| 7 | ^ |
| 8 | |
| 9 | Upstream-Status: Pending |
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 11 | |
| 12 | --- a/storage/mroonga/CMakeLists.txt |
| 13 | +++ b/storage/mroonga/CMakeLists.txt |
| 14 | @@ -80,7 +80,7 @@ else() |
| 15 | set(MRN_SOURCE_DIR ${CMAKE_SOURCE_DIR}) |
| 16 | endif() |
| 17 | |
| 18 | -file(READ ${MRN_SOURCE_DIR}/version MRN_VERSION) |
| 19 | +file(READ ${MRN_SOURCE_DIR}/ver MRN_VERSION) |
| 20 | file(READ ${MRN_SOURCE_DIR}/version_major MRN_VERSION_MAJOR) |
| 21 | file(READ ${MRN_SOURCE_DIR}/version_minor MRN_VERSION_MINOR) |
| 22 | file(READ ${MRN_SOURCE_DIR}/version_micro MRN_VERSION_MICRO) |
| 23 | --- /dev/null |
| 24 | +++ b/storage/mroonga/ver |
| 25 | @@ -0,0 +1 @@ |
| 26 | +7.07 |
| 27 | \ No newline at end of file |
| 28 | --- a/storage/mroonga/version |
| 29 | +++ /dev/null |
| 30 | @@ -1 +0,0 @@ |
| 31 | -7.07 |
| 32 | \ No newline at end of file |