Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
afa4c36c
Commit
afa4c36c
authored
Jun 16, 2014
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmake: prefer INSTALL(PROGRAMS over INSTALL(FILES
parent
6c9dd841
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
21 deletions
+9
-21
cmake/install_macros.cmake
cmake/install_macros.cmake
+1
-7
packaging/solaris/CMakeLists.txt
packaging/solaris/CMakeLists.txt
+2
-3
support-files/CMakeLists.txt
support-files/CMakeLists.txt
+6
-11
No files found.
cmake/install_macros.cmake
View file @
afa4c36c
...
@@ -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
()
...
...
packaging/solaris/CMakeLists.txt
View file @
afa4c36c
...
@@ -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
()
support-files/CMakeLists.txt
View file @
afa4c36c
...
@@ -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
(
FILE
S
${
CMAKE_CURRENT_BINARY_DIR
}
/mysql.server
INSTALL
(
PROGRAM
S
${
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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment