|
|
@ -220,7 +220,7 @@ MACRO(MERGE_LIBRARIES) |
|
|
SET(LIBS ${ARG_DEFAULT_ARGS}) |
|
|
SET(LIBS ${ARG_DEFAULT_ARGS}) |
|
|
LIST(REMOVE_AT LIBS 0) |
|
|
LIST(REMOVE_AT LIBS 0) |
|
|
IF(ARG_STATIC) |
|
|
IF(ARG_STATIC) |
|
|
IF (NOT "${ARG_OUTPUT_NAME}") |
|
|
|
|
|
|
|
|
IF (NOT ARG_OUTPUT_NAME) |
|
|
SET(ARG_OUTPUT_NAME ${TARGET}) |
|
|
SET(ARG_OUTPUT_NAME ${TARGET}) |
|
|
ENDIF() |
|
|
ENDIF() |
|
|
MERGE_STATIC_LIBS(${TARGET} ${ARG_OUTPUT_NAME} "${LIBS}") |
|
|
MERGE_STATIC_LIBS(${TARGET} ${ARG_OUTPUT_NAME} "${LIBS}") |
|
|
|