diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-06-16 21:24:30 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-06-26 11:54:12 +0200 |
| commit | afa4c36ca055328f52973d8b8d28a04520ccdc59 (patch) | |
| tree | 6337a6be73e240ef70302dfb55e2b4c6f2dc035a | |
| parent | 6c9dd841cbe60806ca6cdbc03e60c2e4094cf9f8 (diff) | |
| download | mariadb-git-afa4c36ca055328f52973d8b8d28a04520ccdc59.tar.gz | |
cmake: prefer INSTALL(PROGRAMS over INSTALL(FILES
| -rw-r--r-- | cmake/install_macros.cmake | 8 | ||||
| -rw-r--r-- | packaging/solaris/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | support-files/CMakeLists.txt | 17 |
3 files changed, 9 insertions, 21 deletions
diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake index bd834ece4b0..8226f0f705b 100644 --- a/cmake/install_macros.cmake +++ b/cmake/install_macros.cmake @@ -124,13 +124,7 @@ FUNCTION(INSTALL_SCRIPT) SET(COMP) ENDIF() - INSTALL(FILES - ${script} - DESTINATION ${ARG_DESTINATION} - PERMISSIONS OWNER_READ OWNER_WRITE - OWNER_EXECUTE GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE ${COMP} - ) + INSTALL(PROGRAMS ${script} DESTINATION ${ARG_DESTINATION} ${COMP}) INSTALL_MANPAGE(${script}) ENDFUNCTION() diff --git a/packaging/solaris/CMakeLists.txt b/packaging/solaris/CMakeLists.txt index 899847d0f38..2a29d876567 100644 --- a/packaging/solaris/CMakeLists.txt +++ b/packaging/solaris/CMakeLists.txt @@ -30,7 +30,6 @@ FOREACH(script postinstall-solaris) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh ${CMAKE_CURRENT_BINARY_DIR}/${script} COPYONLY ) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${script} - DESTINATION ${inst_location}/solaris COMPONENT Server_Scripts - 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}/solaris COMPONENT Server_Scripts) ENDFOREACH() 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) |