diff options
| author | Alexander Nozdrin <alik@ibmvm> | 2010-06-21 17:08:16 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@ibmvm> | 2010-06-21 17:08:16 +0400 |
| commit | 07702953a27c1abd03ff263e4bcbb18379f158d7 (patch) | |
| tree | 30763ecb9f7a6e13fb5124138efb039fe120cc56 /mysql-test | |
| parent | 79c88453b29e4baac1eb0f7709a8766c07fc86d0 (diff) | |
| parent | 977be3ee94773481138abd01c25605ac09bbd5e6 (diff) | |
| download | mariadb-git-07702953a27c1abd03ff263e4bcbb18379f158d7.tar.gz | |
Auto-merge from mysql-trunk-stage.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | mysql-test/lib/My/SafeProcess/CMakeLists.txt | 17 |
2 files changed, 12 insertions, 6 deletions
diff --git a/mysql-test/CMakeLists.txt b/mysql-test/CMakeLists.txt index b309db292da..9745699b61d 100644 --- a/mysql-test/CMakeLists.txt +++ b/mysql-test/CMakeLists.txt @@ -16,6 +16,7 @@ INSTALL( DIRECTORY . DESTINATION ${INSTALL_MYSQLTESTDIR} + COMPONENT Test PATTERN "var/" EXCLUDE PATTERN "lib/My/SafeProcess" EXCLUDE PATTERN "lib/t*" EXCLUDE diff --git a/mysql-test/lib/My/SafeProcess/CMakeLists.txt b/mysql-test/lib/My/SafeProcess/CMakeLists.txt index 893e6d896be..f79c2d450b9 100644 --- a/mysql-test/lib/My/SafeProcess/CMakeLists.txt +++ b/mysql-test/lib/My/SafeProcess/CMakeLists.txt @@ -13,15 +13,20 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +SET(INSTALL_ARGS + DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" + COMPONENT Test +) + IF (WIN32) - ADD_EXECUTABLE(my_safe_process safe_process_win.cc) - ADD_EXECUTABLE(my_safe_kill safe_kill_win.cc) + MYSQL_ADD_EXECUTABLE(my_safe_process safe_process_win.cc ${INSTALL_ARGS}) + MYSQL_ADD_EXECUTABLE(my_safe_kill safe_kill_win.cc ${INSTALL_ARGS}) ELSE() - ADD_EXECUTABLE(my_safe_process safe_process.cc) + MYSQL_ADD_EXECUTABLE(my_safe_process safe_process.cc ${INSTALL_ARGS}) ENDIF() -INSTALL(TARGETS my_safe_process DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess") +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") + INSTALL(TARGETS my_safe_kill DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" COMPONENT Test) ENDIF() -INSTALL(FILES safe_process.pl Base.pm DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess") +INSTALL(FILES safe_process.pl Base.pm DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess" COMPONENT Test) |