diff options
| author | Daniel Black <daniel@linux.ibm.com> | 2020-06-11 14:47:34 +1000 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-11 12:33:37 +0300 |
| commit | d6af055c556a8b2f068c84e73d11fe461b3ad3f3 (patch) | |
| tree | 6dcb661e713ece6cc5ce49a6fd80fa950d492772 /cmake | |
| parent | ade0f40ff14a52cfb0dbf400096353e0bef9488a (diff) | |
| download | mariadb-git-d6af055c556a8b2f068c84e73d11fe461b3ad3f3.tar.gz | |
MDEV-22864: cmake/libutils account for cmake-2.8.12.1
That doesn't support STRING(APPEND ..)
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/libutils.cmake | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake index 25fef77b472..faa46f5eeb6 100644 --- a/cmake/libutils.cmake +++ b/cmake/libutils.cmake @@ -207,10 +207,9 @@ MACRO(MERGE_STATIC_LIBS TARGET OUTPUT_NAME LIBS_TO_MERGE) SET(SCRIPT_CONTENTS "CREATE $<TARGET_FILE:${TARGET}>\n") FOREACH(LIB ${STATIC_LIBS}) - STRING(APPEND SCRIPT_CONTENTS "ADDLIB ${LIB}\n") + SET(SCRIPT_CONTENTS "${SCRIPT_CONTENTS}\nADDLIB ${LIB}\n") ENDFOREACH() - STRING(APPEND SCRIPT_CONTENTS "SAVE\nEND\n") - FILE(WRITE ${MRI_SCRIPT_TPL} "${SCRIPT_CONTENTS}") + FILE(WRITE ${MRI_SCRIPT_TPL} "${SCRIPT_CONTENTS}\nSAVE\nEND\n") FILE(GENERATE OUTPUT ${MRI_SCRIPT} INPUT ${MRI_SCRIPT_TPL}) ADD_CUSTOM_COMMAND(TARGET ${TARGET} POST_BUILD |