[Commits] 9e4db08: MDEV-10832 Out of tree build: mysql_install_db to see all .sql files.

Alexey Botchkov holyfoot at askmonty.org
Thu Sep 22 11:33:51 EEST 2016


revision-id: 9e4db083c49e6717ade0818ee7d3ae084c63bfbe (mariadb-10.1.17-16-g9e4db08)
parent(s): 9f837c6e1a54ea05be92112fe7520ffe0134b260
committer: Alexey Botchkov
timestamp: 2016-09-22 12:31:59 +0400
message:

MDEV-10832 Out of tree build: mysql_install_db to see all .sql files.

        Changed builddir for the 'gis_sp' scripts to the BINDIR;

---
 scripts/CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index d960f79..f9c4baa 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -337,16 +337,16 @@ SET(ADD_GIS_SP_SET_DELIMITER "delimiter |")
 SET(ADD_GIS_SP_RESET_DELIMITER "delimiter ;")
 SET(ADD_GIS_SP_EOL "|")
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/maria_add_gis_sp.sql.in
-  ${CMAKE_CURRENT_BINARY_DIR}/maria_add_gis_sp.sql ESCAPE_QUOTES @ONLY)
+  ${CMAKE_CURRENT_SOURCE_DIR}/maria_add_gis_sp.sql ESCAPE_QUOTES @ONLY)
 
 SET(ADD_GIS_SP_SET_DELIMITER "")
 SET(ADD_GIS_SP_RESET_DELIMITER "")
 SET(ADD_GIS_SP_EOL ";")
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/maria_add_gis_sp.sql.in
-  ${CMAKE_CURRENT_BINARY_DIR}/maria_add_gis_sp_bootstrap.sql ESCAPE_QUOTES @ONLY)
+  ${CMAKE_CURRENT_SOURCE_DIR}/maria_add_gis_sp_bootstrap.sql ESCAPE_QUOTES @ONLY)
 
-INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/maria_add_gis_sp.sql
-               ${CMAKE_CURRENT_BINARY_DIR}/maria_add_gis_sp_bootstrap.sql
+INSTALL_SCRIPT(${CMAKE_CURRENT_SOURCE_DIR}/maria_add_gis_sp.sql
+               ${CMAKE_CURRENT_SOURCE_DIR}/maria_add_gis_sp_bootstrap.sql
   DESTINATION ${INSTALL_MYSQLSHAREDIR}
   COMPONENT Server
   )


More information about the commits mailing list