diff options
| author | Jan Lindström <jan.lindstrom@skysql.com> | 2014-06-26 20:47:08 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@skysql.com> | 2014-06-26 20:47:08 +0300 |
| commit | c6d29cd30db9053023124bf74f17f6ee9d8e168d (patch) | |
| tree | a3f90d99d29655c249a8437b421523309cb473fb /support-files/CMakeLists.txt | |
| parent | 3e5994868de68f5112e5faf63188e4f53050afd5 (diff) | |
| parent | be885ebe8c3df78d090c2ad25772959fc2ae9fc9 (diff) | |
| download | mariadb-git-c6d29cd30db9053023124bf74f17f6ee9d8e168d.tar.gz | |
Merge branch '10.1' of github.com:MariaDB/server into 10.1
Diffstat (limited to 'support-files/CMakeLists.txt')
| -rw-r--r-- | support-files/CMakeLists.txt | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index 98e1560f5fb..698d06d1889 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -59,9 +59,8 @@ IF(UNIX) ELSE() SET(comp Server_Scripts) ENDIF() - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${script} - DESTINATION ${inst_location} COMPONENT ${comp} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) + INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${script} + DESTINATION ${inst_location} COMPONENT ${comp}) ENDFOREACH() IF(INSTALL_SUPPORTFILESDIR) INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) @@ -88,19 +87,15 @@ IF(UNIX) SET(pkgdatadir ${prefix}/${INSTALL_MYSQLSHAREDIR}) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql.server.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.server @ONLY) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql.server - DESTINATION ${inst_location} COMPONENT SupportFiles - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ - GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) + INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/mysql.server + DESTINATION ${inst_location} COMPONENT SupportFiles) IF (INSTALL_SYSCONFDIR) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate DESTINATION ${INSTALL_SYSCONFDIR}/logrotate.d RENAME mysql COMPONENT SupportFiles) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql.server + INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/mysql.server DESTINATION ${INSTALL_SYSCONFDIR}/init.d - RENAME mysql COMPONENT SupportFiles - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ - GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) + RENAME mysql COMPONENT SupportFiles) INSTALL(FILES rpm/my.cnf DESTINATION ${INSTALL_SYSCONFDIR} COMPONENT Common) |