diff options
| author | Monty <monty@mariadb.org> | 2016-02-06 18:14:54 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2016-02-06 18:14:54 +0200 |
| commit | b2f8d7b41001a5da11b2d99a055a207c3911a213 (patch) | |
| tree | d108ed6d1f38543305235fec6a63228a5a2f08d5 /cmake/install_macros.cmake | |
| parent | d4b3a199acb0ddcdedff441ae664b0a2cf2fe8d2 (diff) | |
| parent | 07b8aefe90ca830d2de068f2966cd2288b158a88 (diff) | |
| download | mariadb-git-b2f8d7b41001a5da11b2d99a055a207c3911a213.tar.gz | |
Merge branch '10.1' into 10.2
Conflicts:
VERSION
cmake/plugin.cmake
config.h.cmake
configure.cmake
plugin/server_audit/server_audit.c
sql/sql_yacc.yy
Diffstat (limited to 'cmake/install_macros.cmake')
| -rw-r--r-- | cmake/install_macros.cmake | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake index 62ccca8deb4..17ee3c61554 100644 --- a/cmake/install_macros.cmake +++ b/cmake/install_macros.cmake @@ -44,11 +44,10 @@ FUNCTION (INSTALL_DEBUG_SYMBOLS) ENDIF() set(comp "") - IF(ARG_COMPONENT STREQUAL "Server") - IF(target MATCHES "mysqld" OR type MATCHES "MODULE") - #MESSAGE("PDB: ${targets}") - SET(comp Server) - ENDIF() + + IF(target MATCHES "mysqld" OR type MATCHES "MODULE") + #MESSAGE("PDB: ${targets}") + SET(comp Server) ENDIF() IF(NOT comp MATCHES Server) |