Commit afa4c36c authored by Sergei Golubchik's avatar Sergei Golubchik

cmake: prefer INSTALL(PROGRAMS over INSTALL(FILES

parent 6c9dd841
...@@ -124,13 +124,7 @@ FUNCTION(INSTALL_SCRIPT) ...@@ -124,13 +124,7 @@ FUNCTION(INSTALL_SCRIPT)
SET(COMP) SET(COMP)
ENDIF() ENDIF()
INSTALL(FILES INSTALL(PROGRAMS ${script} DESTINATION ${ARG_DESTINATION} ${COMP})
${script}
DESTINATION ${ARG_DESTINATION}
PERMISSIONS OWNER_READ OWNER_WRITE
OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
WORLD_READ WORLD_EXECUTE ${COMP}
)
INSTALL_MANPAGE(${script}) INSTALL_MANPAGE(${script})
ENDFUNCTION() ENDFUNCTION()
......
...@@ -30,7 +30,6 @@ FOREACH(script postinstall-solaris) ...@@ -30,7 +30,6 @@ FOREACH(script postinstall-solaris)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh
${CMAKE_CURRENT_BINARY_DIR}/${script} COPYONLY ) ${CMAKE_CURRENT_BINARY_DIR}/${script} COPYONLY )
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${script} INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${script}
DESTINATION ${inst_location}/solaris COMPONENT Server_Scripts DESTINATION ${inst_location}/solaris COMPONENT Server_Scripts)
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
ENDFOREACH() ENDFOREACH()
...@@ -59,9 +59,8 @@ IF(UNIX) ...@@ -59,9 +59,8 @@ IF(UNIX)
ELSE() ELSE()
SET(comp Server_Scripts) SET(comp Server_Scripts)
ENDIF() ENDIF()
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${script} INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${script}
DESTINATION ${inst_location} COMPONENT ${comp} DESTINATION ${inst_location} COMPONENT ${comp})
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
ENDFOREACH() ENDFOREACH()
IF(INSTALL_SUPPORTFILESDIR) IF(INSTALL_SUPPORTFILESDIR)
INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
...@@ -88,19 +87,15 @@ IF(UNIX) ...@@ -88,19 +87,15 @@ IF(UNIX)
SET(pkgdatadir ${prefix}/${INSTALL_MYSQLSHAREDIR}) SET(pkgdatadir ${prefix}/${INSTALL_MYSQLSHAREDIR})
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql.server.sh CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql.server.sh
${CMAKE_CURRENT_BINARY_DIR}/mysql.server @ONLY) ${CMAKE_CURRENT_BINARY_DIR}/mysql.server @ONLY)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql.server INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/mysql.server
DESTINATION ${inst_location} COMPONENT SupportFiles DESTINATION ${inst_location} COMPONENT SupportFiles)
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
IF (INSTALL_SYSCONFDIR) IF (INSTALL_SYSCONFDIR)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate DESTINATION ${INSTALL_SYSCONFDIR}/logrotate.d INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate DESTINATION ${INSTALL_SYSCONFDIR}/logrotate.d
RENAME mysql COMPONENT SupportFiles) 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 DESTINATION ${INSTALL_SYSCONFDIR}/init.d
RENAME mysql COMPONENT SupportFiles RENAME mysql COMPONENT SupportFiles)
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
INSTALL(FILES rpm/my.cnf DESTINATION ${INSTALL_SYSCONFDIR} INSTALL(FILES rpm/my.cnf DESTINATION ${INSTALL_SYSCONFDIR}
COMPONENT Common) COMPONENT Common)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment