From 266c8122827be645cd5cfd4b3753cf96c66d428c Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Fri, 15 Jan 2010 19:07:45 +0100 Subject: [PATCH] Fix output name of embedded library, honor OUTPUT_NAME in MERGE_LIBRARIES macro --- cmake/libutils.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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}")