diff options
| author | Sreedhar.S <sreedhar.sreedhargadda@oracle.com> | 2013-09-30 13:01:17 +0530 |
|---|---|---|
| committer | Sreedhar.S <sreedhar.sreedhargadda@oracle.com> | 2013-09-30 13:01:17 +0530 |
| commit | 39a87704d8a3f747e8a036460d3d044741db1764 (patch) | |
| tree | 31b4d18a942f3a8f7b489a16e7d6d7ba73427b5e /scripts | |
| parent | 1fc8cbec49ab3eaeecdf283be86fe9024ed65dfc (diff) | |
| download | mariadb-git-39a87704d8a3f747e8a036460d3d044741db1764.tar.gz | |
Bug #16619754 - MYSQL_INSTALL_DB.PL FAILS TO CREATE DATABASE ON WINDOWS.
As this mysql_install_db.pl file has always generated lots of confusion on Windows. This fix will make sure to get it removed only from Windows
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/CMakeLists.txt | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 424d92e31e1..d5a3311d942 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -198,24 +198,17 @@ ELSE() SET(localstatedir ${MYSQL_DATADIR}) ENDIF() -IF(UNIX) -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh - ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY) +IF(NOT WIN32) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.pl.in + ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY) SET(DEST ${INSTALL_SCRIPTDIR}) - SET(EXT) -ELSE() - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.pl.in - ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db.pl ESCAPE_QUOTES @ONLY) - SET(DEST ${INSTALL_SCRIPTDIR}) - SET(EXT ".pl") -ENDIF() -INSTALL_SCRIPT( - "${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db${EXT}" - DESTINATION ${DEST} - COMPONENT Server + INSTALL_SCRIPT( + "${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db" + DESTINATION ${DEST} + COMPONENT Server ) - +ENDIF() SET(prefix "${CMAKE_INSTALL_PREFIX}") SET(sysconfdir ${prefix}) |