diff options
| author | Vladislav Vaintroub <wlad@sun.com> | 2010-01-15 19:07:45 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@sun.com> | 2010-01-15 19:07:45 +0100 |
| commit | 0bdd08d9969f9fa74049bd48226b42165fd3e198 (patch) | |
| tree | d72f36b1bc36ea7e401f911598afb63d3eee9bd0 /cmake/libutils.cmake | |
| parent | 2ed249e9e0665974ab3cc8ec59323aa35fd4da60 (diff) | |
| download | mariadb-git-0bdd08d9969f9fa74049bd48226b42165fd3e198.tar.gz | |
Fix output name of embedded library,
honor OUTPUT_NAME in MERGE_LIBRARIES macro
Diffstat (limited to 'cmake/libutils.cmake')
| -rw-r--r-- | cmake/libutils.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake index e4b4e980b00..ff74809d224 100644 --- a/cmake/libutils.cmake +++ b/cmake/libutils.cmake @@ -220,7 +220,7 @@ MACRO(MERGE_LIBRARIES) SET(LIBS ${ARG_DEFAULT_ARGS}) LIST(REMOVE_AT LIBS 0) IF(ARG_STATIC) - IF (NOT "${ARG_OUTPUT_NAME}") + IF (NOT ARG_OUTPUT_NAME) SET(ARG_OUTPUT_NAME ${TARGET}) ENDIF() MERGE_STATIC_LIBS(${TARGET} ${ARG_OUTPUT_NAME} "${LIBS}") |