Fix some glitches with INSTALL_LAYOUT=STANDALONE

vaintroub · vaintroub · commit 0563ac784eed · 2010-02-19T18:30:08.000+01:00
- mysql_install_db is in scripts dir now
- sql-bench is installed
-some extra support-files (e.g ini) are in support-files
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
@@ -157,7 +157,7 @@ ENDIF()
 IF(UNIX)
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh
   ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY)
-  SET(DEST ${INSTALL_BINDIR})
+  SET(DEST ${INSTALL_SCRIPTDIR})
   SET(EXT)
 ELSE()
  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.pl.in
diff --git a/sql-bench/CMakeLists.txt b/sql-bench/CMakeLists.txt
@@ -22,7 +22,7 @@ ${CMAKE_SOURCE_DIR}/sql-bench/Comments/*
 ${CMAKE_SOURCE_DIR}/sql-bench/limits/*
 )
 
-IF(NOT INSTALL_SQLBENCHDIR)
+IF(NOT INSTALL_SQLBENCHROOTDIR)
  RETURN()
 ENDIF()
 
diff --git 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 )
 

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ ${CMAKE_SOURCE_DIR}/sql-bench/Comments/*`
`22`	`22`	`${CMAKE_SOURCE_DIR}/sql-bench/limits/*`
`23`	`23`	`)`
`24`	`24`
`25`		`-IF(NOT INSTALL_SQLBENCHDIR)`
	`25`	`+IF(NOT INSTALL_SQLBENCHROOTDIR)`
`26`	`26`	`RETURN()`
`27`	`27`	`ENDIF()`
`28`	`28`