database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Fix some glitches with INSTALL_LAYOUT=STANDALONE

Browse Source 
- mysql_install_db is in scripts dir now
- sql-bench is installed
-some extra support-files (e.g ini) are in support-files
This commit is contained in:
Vladislav Vaintroub
2010-02-19 18:30:08 +01:00
parent 78c9b11c36
commit ea839618c4
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/CMakeLists.txt
View File

@@ -157,7 +157,7 @@ ENDIF()
IF(UNIX) IF(UNIX)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh
${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY) ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY)
SET(DEST ${INSTALL_BINDIR}) SET(DEST ${INSTALL_SCRIPTDIR})
SET(EXT) SET(EXT)
ELSE() ELSE()
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.pl.in CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.pl.in

2
sql-bench/CMakeLists.txt
View File

@@ -22,7 +22,7 @@ ${CMAKE_SOURCE_DIR}/sql-bench/Comments/*
${CMAKE_SOURCE_DIR}/sql-bench/limits/* ${CMAKE_SOURCE_DIR}/sql-bench/limits/*
) )
IF(NOT INSTALL_SQLBENCHDIR) IF(NOT INSTALL_SQLBENCHROOTDIR)
RETURN() RETURN()
ENDIF() ENDIF()

20
support-files/CMakeLists.txt
View File

@@ -31,11 +31,20 @@ ELSE()
SET(ini_file_extension "cnf") SET(ini_file_extension "cnf")
ENDIF() 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) FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh
${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY) ${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() ENDFOREACH()
IF(UNIX) IF(UNIX)
@@ -47,10 +56,9 @@ IF(UNIX)
SET(inst_location ${INSTALL_MYSQLSHAREDIR}) SET(inst_location ${INSTALL_MYSQLSHAREDIR})
ENDIF() 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 binary-configure
config.medium.ini config.small.ini config.huge.ini ndb-config-2-node.ini)
FOREACH(script mysqld_multi.server mysql-log-rotate)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh
${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )