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/mysql_add_executable.cmake | |
| parent | 784d4a47187a960b43225d45a27ee0fe435603ea (diff) | |
| download | mariadb-git-3bd236fefb0024fa4f304d50f8725fcd153631f1.tar.gz | |
Add components to INSTALL, some eraly Wix support
Diffstat (limited to 'cmake/mysql_add_executable.cmake')
| -rw-r--r-- | cmake/mysql_add_executable.cmake | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/cmake/mysql_add_executable.cmake b/cmake/mysql_add_executable.cmake index 2157d03e6d1..86301c2eec8 100644 --- a/cmake/mysql_add_executable.cmake +++ b/cmake/mysql_add_executable.cmake @@ -29,7 +29,7 @@ INCLUDE(cmake_parse_arguments) FUNCTION (MYSQL_ADD_EXECUTABLE)
# Pass-through arguments for ADD_EXECUTABLE
CMAKE_PARSE_ARGUMENTS(ARG
- "WIN32;MACOSX_BUNDLE;EXCLUDE_FROM_ALL;DESTINATION"
+ "WIN32;MACOSX_BUNDLE;EXCLUDE_FROM_ALL;DESTINATION;COMPONENT"
""
${ARGN}
)
@@ -43,7 +43,14 @@ FUNCTION (MYSQL_ADD_EXECUTABLE) IF(NOT ARG_EXCLUDE_FROM_ALL)
IF(NOT ARG_DESTINATION)
SET(ARG_DESTINATION ${INSTALL_BINDIR})
+ ENDIF() + IF(ARG_COMPONENT) + SET(COMP COMPONENT ${ARG_COMPONENT}) + ELSEIF(MYSQL_INSTALL_COMPONENT) + SET(COMP COMPONENT ${MYSQL_INSTALL_COMPONENT}) + ELSE() + SET(COMP COMPONENT Client) ENDIF()
- MYSQL_INSTALL_TARGETS(${target} DESTINATION ${ARG_DESTINATION})
+ MYSQL_INSTALL_TARGETS(${target} DESTINATION ${ARG_DESTINATION} ${COMP})
ENDIF()
-ENDFUNCTION()
\ No newline at end of file +ENDFUNCTION() |