diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-02-10 20:23:24 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-02-10 20:23:24 +0100 |
| commit | 3bd236fefb0024fa4f304d50f8725fcd153631f1 (patch) | |
| tree | dfea6a5cf6f617ecfe6559b0eff36aba6b474d05 /cmake/libutils.cmake | |
| parent | 784d4a47187a960b43225d45a27ee0fe435603ea (diff) | |
| download | mariadb-git-3bd236fefb0024fa4f304d50f8725fcd153631f1.tar.gz | |
Add components to INSTALL, some eraly Wix support
Diffstat (limited to 'cmake/libutils.cmake')
| -rw-r--r-- | cmake/libutils.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake index 2263b146ed6..ba63df71428 100644 --- a/cmake/libutils.cmake +++ b/cmake/libutils.cmake @@ -214,7 +214,7 @@ ENDMACRO() #) MACRO(MERGE_LIBRARIES) CMAKE_PARSE_ARGUMENTS(ARG - "EXPORTS;OUTPUT_NAME" + "EXPORTS;OUTPUT_NAME;COMPONENT" "STATIC;SHARED;MODULE;NOINSTALL" ${ARGN} ) @@ -259,7 +259,10 @@ MACRO(MERGE_LIBRARIES) MESSAGE(FATAL_ERROR "Unknown library type") ENDIF() IF(NOT ARG_NOINSTALL) - MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${INSTALL_LIBDIR}") + IF(ARG_COMPONENT) + SET(COMP COMPONENT ${ARG_COMPONENT}) + ENDIF() + MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP}) ENDIF() SET_TARGET_PROPERTIES(${TARGET} PROPERTIES LINK_INTERFACE_LIBRARIES "") ENDMACRO() |