diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-02-19 18:30:08 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-02-19 18:30:08 +0100 |
| commit | ea839618c4177250cd8e7a35cceb2353701ffaf6 (patch) | |
| tree | 20b1ded3e15af6e1597f73be95bd3ed344b1c0e3 /support-files/CMakeLists.txt | |
| parent | 78c9b11c366d85ce819a89d93195dcdda54e7648 (diff) | |
| download | mariadb-git-ea839618c4177250cd8e7a35cceb2353701ffaf6.tar.gz | |
Fix some glitches with INSTALL_LAYOUT=STANDALONE
- mysql_install_db is in scripts dir now
- sql-bench is installed
-some extra support-files (e.g ini) are in support-files
Diffstat (limited to 'support-files/CMakeLists.txt')
| -rw-r--r-- | support-files/CMakeLists.txt | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index ff98a7dd885..85be470e21b 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -31,11 +31,20 @@ ELSE() SET(ini_file_extension "cnf") ENDIF() +IF(UNIX) + IF(INSTALL_LAYOUT MATCHES "STANDALONE") + SET(inst_location ${INSTALL_SUPPORTFILESDIR}) + ELSE() + SET(inst_location ${INSTALL_DOCREADMEDIR}) + ENDIF() +ELSE() + SET(inst_location ${INSTALL_DOCREADMEDIR}) +ENDIF() + FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} DESTINATION ${INSTALL_DOCREADMEDIR}) - + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} DESTINATION ${inst_location}) ENDFOREACH() IF(UNIX) @@ -47,10 +56,9 @@ IF(UNIX) SET(inst_location ${INSTALL_MYSQLSHAREDIR}) ENDIF() - FILE(GLOB ndb_ini_files ${CMAKE_CURRENT_SOURCE_DIR}/*.ini) - INSTALL(FILES ${ndb_ini_files} DESTINATION ${inst_location}) - - FOREACH(script mysqld_multi.server mysql-log-rotate) + + FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure + config.medium.ini config.small.ini config.huge.ini ndb-config-2-node.ini) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) |