diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2013-04-02 11:14:39 +0200 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2013-04-02 11:14:39 +0200 |
| commit | 24b1ef8dae6912e87a38f5b409b87128a77250b3 (patch) | |
| tree | 32319f5405946e6893b07d4a99513fe7de2860ef /mysql-test/lib/My/SafeProcess | |
| parent | ba0f8ee240819f6d4d87d2728a2d317645fe2e91 (diff) | |
| download | mariadb-git-24b1ef8dae6912e87a38f5b409b87128a77250b3.tar.gz | |
Bug#11765629 CMAKE: CAN SUPPRESS INSTALLATION OF SQL-BENCH, BUT NOT MYSQL-TEST
Don't try to install anything into INSTALL_MYSQLTESTDIR
if it is explicitly set empty on the cmake command line.
Diffstat (limited to 'mysql-test/lib/My/SafeProcess')
| -rw-r--r-- | mysql-test/lib/My/SafeProcess/CMakeLists.txt | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/mysql-test/lib/My/SafeProcess/CMakeLists.txt b/mysql-test/lib/My/SafeProcess/CMakeLists.txt index 95e23756c30..7d39129d0f5 100644 --- a/mysql-test/lib/My/SafeProcess/CMakeLists.txt +++ b/mysql-test/lib/My/SafeProcess/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -13,6 +13,10 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +IF (NOT INSTALL_MYSQLTESTDIR) + RETURN() +ENDIF() + SET(INSTALL_ARGS DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" COMPONENT Test @@ -25,8 +29,16 @@ ELSE() MYSQL_ADD_EXECUTABLE(my_safe_process safe_process.cc ${INSTALL_ARGS}) ENDIF() -INSTALL(TARGETS my_safe_process DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" COMPONENT Test) +INSTALL(TARGETS my_safe_process + DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" COMPONENT Test +) + IF(WIN32) - INSTALL(TARGETS my_safe_kill DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" COMPONENT Test) + INSTALL(TARGETS my_safe_kill + DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" COMPONENT Test + ) ENDIF() -INSTALL(FILES Base.pm DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" COMPONENT Test) + +INSTALL(FILES Base.pm + DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" COMPONENT Test +) |