reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-11-24 12:09:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge topic 'GNUInstallDirs-add-RUNSTATEDIR'

Browse Source 
40814a7c GNUInstallDirs: Add RUNSTATEDIR variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !706
This commit is contained in:
Brad King 2017-04-21 12:55:27 +00:00 committed by Kitware Robot
commit 744f809765
6 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Modules/GNUInstallDirs.cmake
View File

@ -45,6 +45,8 @@
# modifiable architecture-independent data (``com``) # modifiable architecture-independent data (``com``)
# ``LOCALSTATEDIR`` # ``LOCALSTATEDIR``
# modifiable single-machine data (``var``) # modifiable single-machine data (``var``)
# ``RUNSTATEDIR``
# run-time variable data (``LOCALSTATEDIR/run``)
# ``LIBDIR`` # ``LIBDIR``
# object code libraries (``lib`` or ``lib64`` # object code libraries (``lib`` or ``lib64``
# or ``lib/<multiarch-tuple>`` on Debian) # or ``lib/<multiarch-tuple>`` on Debian)
@ -75,10 +77,10 @@
# #
# ``/`` # ``/``
# #
# For ``<dir>`` other than the ``SYSCONFDIR`` and ``LOCALSTATEDIR``, # For ``<dir>`` other than the ``SYSCONFDIR``, ``LOCALSTATEDIR`` and
# the value of ``CMAKE_INSTALL_<dir>`` is prefixed with ``usr/`` if # ``RUNSTATEDIR``, the value of ``CMAKE_INSTALL_<dir>`` is prefixed
# it is not user-specified as an absolute path. For example, the # with ``usr/`` if it is not user-specified as an absolute path.
# ``INCLUDEDIR`` value ``include`` becomes ``usr/include``. # For example, the ``INCLUDEDIR`` value ``include`` becomes ``usr/include``.
# This is required by the `GNU Coding Standards`_, which state: # This is required by the `GNU Coding Standards`_, which state:
# #
# When building the complete GNU system, the prefix will be empty # When building the complete GNU system, the prefix will be empty
@ -86,20 +88,21 @@
# #
# ``/usr`` # ``/usr``
# #
# For ``<dir>`` equal to ``SYSCONFDIR`` or ``LOCALSTATEDIR``, the # For ``<dir>`` equal to ``SYSCONFDIR``, ``LOCALSTATEDIR`` or
# ``CMAKE_INSTALL_FULL_<dir>`` is computed by prepending just ``/`` # ``RUNSTATEDIR``, the ``CMAKE_INSTALL_FULL_<dir>`` is computed by
# to the value of ``CMAKE_INSTALL_<dir>`` if it is not user-specified # prepending just ``/`` to the value of ``CMAKE_INSTALL_<dir>``
# as an absolute path. For example, the ``SYSCONFDIR`` value ``etc`` # if it is not user-specified as an absolute path.
# becomes ``/etc``. This is required by the `GNU Coding Standards`_. # For example, the ``SYSCONFDIR`` value ``etc`` becomes ``/etc``.
# This is required by the `GNU Coding Standards`_.
# #
# ``/opt/...`` # ``/opt/...``
# #
# For ``<dir>`` equal to ``SYSCONFDIR`` or ``LOCALSTATEDIR``, the # For ``<dir>`` equal to ``SYSCONFDIR``, ``LOCALSTATEDIR`` or
# ``CMAKE_INSTALL_FULL_<dir>`` is computed by *appending* the prefix # ``RUNSTATEDIR``, the ``CMAKE_INSTALL_FULL_<dir>`` is computed by
# to the value of ``CMAKE_INSTALL_<dir>`` if it is not user-specified # *appending* the prefix to the value of ``CMAKE_INSTALL_<dir>``
# as an absolute path. For example, the ``SYSCONFDIR`` value ``etc`` # if it is not user-specified as an absolute path.
# becomes ``/etc/opt/...``. This is defined by the # For example, the ``SYSCONFDIR`` value ``etc`` becomes ``/etc/opt/...``.
# `Filesystem Hierarchy Standard`_. # This is defined by the `Filesystem Hierarchy Standard`_.
# #
# .. _`Filesystem Hierarchy Standard`: https://refspecs.linuxfoundation.org/FHS_3.0/fhs/index.html # .. _`Filesystem Hierarchy Standard`: https://refspecs.linuxfoundation.org/FHS_3.0/fhs/index.html
# #
@ -287,6 +290,9 @@ _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_LOCALEDIR "${CMAKE_INSTALL_DAT
_GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}" _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}"
"Documentation root (DATAROOTDIR/doc/PROJECT_NAME)") "Documentation root (DATAROOTDIR/doc/PROJECT_NAME)")
_GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_RUNSTATEDIR "${CMAKE_INSTALL_LOCALSTATEDIR}/run"
"Run-time variable data (LOCALSTATEDIR/run)")
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
mark_as_advanced( mark_as_advanced(
@ -296,6 +302,7 @@ mark_as_advanced(
CMAKE_INSTALL_SYSCONFDIR CMAKE_INSTALL_SYSCONFDIR
CMAKE_INSTALL_SHAREDSTATEDIR CMAKE_INSTALL_SHAREDSTATEDIR
CMAKE_INSTALL_LOCALSTATEDIR CMAKE_INSTALL_LOCALSTATEDIR
CMAKE_INSTALL_RUNSTATEDIR
CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_LIBDIR
CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_INCLUDEDIR
CMAKE_INSTALL_OLDINCLUDEDIR CMAKE_INSTALL_OLDINCLUDEDIR
@ -314,7 +321,7 @@ macro(GNUInstallDirs_get_absolute_install_dir absvar var)
# - CMAKE_INSTALL_PREFIX == /usr # - CMAKE_INSTALL_PREFIX == /usr
# - CMAKE_INSTALL_PREFIX == /opt/... # - CMAKE_INSTALL_PREFIX == /opt/...
if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/") if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/")
if("${dir}" STREQUAL "SYSCONFDIR" OR "${dir}" STREQUAL "LOCALSTATEDIR") if("${dir}" STREQUAL "SYSCONFDIR" OR "${dir}" STREQUAL "LOCALSTATEDIR" OR "${dir}" STREQUAL "RUNSTATEDIR")
set(${absvar} "/${${var}}") set(${absvar} "/${${var}}")
else() else()
if (NOT "${${var}}" MATCHES "^usr/") if (NOT "${${var}}" MATCHES "^usr/")
@ -323,13 +330,13 @@ macro(GNUInstallDirs_get_absolute_install_dir absvar var)
set(${absvar} "/${${var}}") set(${absvar} "/${${var}}")
endif() endif()
elseif("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$") elseif("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$")
if("${dir}" STREQUAL "SYSCONFDIR" OR "${dir}" STREQUAL "LOCALSTATEDIR") if("${dir}" STREQUAL "SYSCONFDIR" OR "${dir}" STREQUAL "LOCALSTATEDIR" OR "${dir}" STREQUAL "RUNSTATEDIR")
set(${absvar} "/${${var}}") set(${absvar} "/${${var}}")
else() else()
set(${absvar} "${CMAKE_INSTALL_PREFIX}/${${var}}") set(${absvar} "${CMAKE_INSTALL_PREFIX}/${${var}}")
endif() endif()
elseif("${CMAKE_INSTALL_PREFIX}" MATCHES "^/opt/.*") elseif("${CMAKE_INSTALL_PREFIX}" MATCHES "^/opt/.*")
if("${dir}" STREQUAL "SYSCONFDIR" OR "${dir}" STREQUAL "LOCALSTATEDIR") if("${dir}" STREQUAL "SYSCONFDIR" OR "${dir}" STREQUAL "LOCALSTATEDIR" OR "${dir}" STREQUAL "RUNSTATEDIR")
set(${absvar} "/${${var}}${CMAKE_INSTALL_PREFIX}") set(${absvar} "/${${var}}${CMAKE_INSTALL_PREFIX}")
else() else()
set(${absvar} "${CMAKE_INSTALL_PREFIX}/${${var}}") set(${absvar} "${CMAKE_INSTALL_PREFIX}/${${var}}")
@ -351,6 +358,7 @@ foreach(dir
SYSCONFDIR SYSCONFDIR
SHAREDSTATEDIR SHAREDSTATEDIR
LOCALSTATEDIR LOCALSTATEDIR
RUNSTATEDIR
LIBDIR LIBDIR
INCLUDEDIR INCLUDEDIR
OLDINCLUDEDIR OLDINCLUDEDIR

1
Tests/RunCMake/GNUInstallDirs/Common.cmake
View File

@ -15,6 +15,7 @@ set(dirs
LIBEXECDIR LIBEXECDIR
LOCALEDIR LOCALEDIR
LOCALSTATEDIR LOCALSTATEDIR
RUNSTATEDIR
MANDIR MANDIR
SBINDIR SBINDIR
SHAREDSTATEDIR SHAREDSTATEDIR

2
Tests/RunCMake/GNUInstallDirs/Opt-stderr.txt
View File

@ -8,6 +8,7 @@ CMAKE_INSTALL_LIBDIR='(lib|lib64)'
CMAKE_INSTALL_LIBEXECDIR='libexec' CMAKE_INSTALL_LIBEXECDIR='libexec'
CMAKE_INSTALL_LOCALEDIR='share/locale' CMAKE_INSTALL_LOCALEDIR='share/locale'
CMAKE_INSTALL_LOCALSTATEDIR='var' CMAKE_INSTALL_LOCALSTATEDIR='var'
CMAKE_INSTALL_RUNSTATEDIR='var/run'
CMAKE_INSTALL_MANDIR='share/man' CMAKE_INSTALL_MANDIR='share/man'
CMAKE_INSTALL_SBINDIR='sbin' CMAKE_INSTALL_SBINDIR='sbin'
CMAKE_INSTALL_SHAREDSTATEDIR='com' CMAKE_INSTALL_SHAREDSTATEDIR='com'
@ -22,6 +23,7 @@ CMAKE_INSTALL_FULL_LIBDIR='/opt/Opt/(lib|lib64)'
CMAKE_INSTALL_FULL_LIBEXECDIR='/opt/Opt/libexec' CMAKE_INSTALL_FULL_LIBEXECDIR='/opt/Opt/libexec'
CMAKE_INSTALL_FULL_LOCALEDIR='/opt/Opt/share/locale' CMAKE_INSTALL_FULL_LOCALEDIR='/opt/Opt/share/locale'
CMAKE_INSTALL_FULL_LOCALSTATEDIR='/var/opt/Opt' CMAKE_INSTALL_FULL_LOCALSTATEDIR='/var/opt/Opt'
CMAKE_INSTALL_FULL_RUNSTATEDIR='/var/run/opt/Opt'
CMAKE_INSTALL_FULL_MANDIR='/opt/Opt/share/man' CMAKE_INSTALL_FULL_MANDIR='/opt/Opt/share/man'
CMAKE_INSTALL_FULL_SBINDIR='/opt/Opt/sbin' CMAKE_INSTALL_FULL_SBINDIR='/opt/Opt/sbin'
CMAKE_INSTALL_FULL_SHAREDSTATEDIR='/opt/Opt/com' CMAKE_INSTALL_FULL_SHAREDSTATEDIR='/opt/Opt/com'

2
Tests/RunCMake/GNUInstallDirs/Root-stderr.txt
View File

@ -8,6 +8,7 @@ CMAKE_INSTALL_LIBDIR='usr/(lib|lib64)'
CMAKE_INSTALL_LIBEXECDIR='usr/libexec' CMAKE_INSTALL_LIBEXECDIR='usr/libexec'
CMAKE_INSTALL_LOCALEDIR='usr/share/locale' CMAKE_INSTALL_LOCALEDIR='usr/share/locale'
CMAKE_INSTALL_LOCALSTATEDIR='var' CMAKE_INSTALL_LOCALSTATEDIR='var'
CMAKE_INSTALL_RUNSTATEDIR='var/run'
CMAKE_INSTALL_MANDIR='usr/share/man' CMAKE_INSTALL_MANDIR='usr/share/man'
CMAKE_INSTALL_SBINDIR='usr/sbin' CMAKE_INSTALL_SBINDIR='usr/sbin'
CMAKE_INSTALL_SHAREDSTATEDIR='usr/com' CMAKE_INSTALL_SHAREDSTATEDIR='usr/com'
@ -22,6 +23,7 @@ CMAKE_INSTALL_FULL_LIBDIR='/usr/(lib|lib64)'
CMAKE_INSTALL_FULL_LIBEXECDIR='/usr/libexec' CMAKE_INSTALL_FULL_LIBEXECDIR='/usr/libexec'
CMAKE_INSTALL_FULL_LOCALEDIR='/usr/share/locale' CMAKE_INSTALL_FULL_LOCALEDIR='/usr/share/locale'
CMAKE_INSTALL_FULL_LOCALSTATEDIR='/var' CMAKE_INSTALL_FULL_LOCALSTATEDIR='/var'
CMAKE_INSTALL_FULL_RUNSTATEDIR='/var/run'
CMAKE_INSTALL_FULL_MANDIR='/usr/share/man' CMAKE_INSTALL_FULL_MANDIR='/usr/share/man'
CMAKE_INSTALL_FULL_SBINDIR='/usr/sbin' CMAKE_INSTALL_FULL_SBINDIR='/usr/sbin'
CMAKE_INSTALL_FULL_SHAREDSTATEDIR='/usr/com' CMAKE_INSTALL_FULL_SHAREDSTATEDIR='/usr/com'

2
Tests/RunCMake/GNUInstallDirs/Usr-stderr.txt
View File

@ -8,6 +8,7 @@ CMAKE_INSTALL_LIBDIR='(lib|lib64|lib/arch)'
CMAKE_INSTALL_LIBEXECDIR='libexec' CMAKE_INSTALL_LIBEXECDIR='libexec'
CMAKE_INSTALL_LOCALEDIR='share/locale' CMAKE_INSTALL_LOCALEDIR='share/locale'
CMAKE_INSTALL_LOCALSTATEDIR='var' CMAKE_INSTALL_LOCALSTATEDIR='var'
CMAKE_INSTALL_RUNSTATEDIR='var/run'
CMAKE_INSTALL_MANDIR='share/man' CMAKE_INSTALL_MANDIR='share/man'
CMAKE_INSTALL_SBINDIR='sbin' CMAKE_INSTALL_SBINDIR='sbin'
CMAKE_INSTALL_SHAREDSTATEDIR='com' CMAKE_INSTALL_SHAREDSTATEDIR='com'
@ -22,6 +23,7 @@ CMAKE_INSTALL_FULL_LIBDIR='/usr/(lib|lib64|lib/arch)'
CMAKE_INSTALL_FULL_LIBEXECDIR='/usr/libexec' CMAKE_INSTALL_FULL_LIBEXECDIR='/usr/libexec'
CMAKE_INSTALL_FULL_LOCALEDIR='/usr/share/locale' CMAKE_INSTALL_FULL_LOCALEDIR='/usr/share/locale'
CMAKE_INSTALL_FULL_LOCALSTATEDIR='/var' CMAKE_INSTALL_FULL_LOCALSTATEDIR='/var'
CMAKE_INSTALL_FULL_RUNSTATEDIR='/var/run'
CMAKE_INSTALL_FULL_MANDIR='/usr/share/man' CMAKE_INSTALL_FULL_MANDIR='/usr/share/man'
CMAKE_INSTALL_FULL_SBINDIR='/usr/sbin' CMAKE_INSTALL_FULL_SBINDIR='/usr/sbin'
CMAKE_INSTALL_FULL_SHAREDSTATEDIR='/usr/com' CMAKE_INSTALL_FULL_SHAREDSTATEDIR='/usr/com'

2
Tests/RunCMake/GNUInstallDirs/UsrLocal-stderr.txt
View File

@ -8,6 +8,7 @@ CMAKE_INSTALL_LIBDIR='(lib|lib64)'
CMAKE_INSTALL_LIBEXECDIR='libexec' CMAKE_INSTALL_LIBEXECDIR='libexec'
CMAKE_INSTALL_LOCALEDIR='share/locale' CMAKE_INSTALL_LOCALEDIR='share/locale'
CMAKE_INSTALL_LOCALSTATEDIR='var' CMAKE_INSTALL_LOCALSTATEDIR='var'
CMAKE_INSTALL_RUNSTATEDIR='var/run'
CMAKE_INSTALL_MANDIR='share/man' CMAKE_INSTALL_MANDIR='share/man'
CMAKE_INSTALL_SBINDIR='sbin' CMAKE_INSTALL_SBINDIR='sbin'
CMAKE_INSTALL_SHAREDSTATEDIR='com' CMAKE_INSTALL_SHAREDSTATEDIR='com'
@ -22,6 +23,7 @@ CMAKE_INSTALL_FULL_LIBDIR='/usr/local/(lib|lib64)'
CMAKE_INSTALL_FULL_LIBEXECDIR='/usr/local/libexec' CMAKE_INSTALL_FULL_LIBEXECDIR='/usr/local/libexec'
CMAKE_INSTALL_FULL_LOCALEDIR='/usr/local/share/locale' CMAKE_INSTALL_FULL_LOCALEDIR='/usr/local/share/locale'
CMAKE_INSTALL_FULL_LOCALSTATEDIR='/usr/local/var' CMAKE_INSTALL_FULL_LOCALSTATEDIR='/usr/local/var'
CMAKE_INSTALL_FULL_RUNSTATEDIR='/usr/local/var/run'
CMAKE_INSTALL_FULL_MANDIR='/usr/local/share/man' CMAKE_INSTALL_FULL_MANDIR='/usr/local/share/man'
CMAKE_INSTALL_FULL_SBINDIR='/usr/local/sbin' CMAKE_INSTALL_FULL_SBINDIR='/usr/local/sbin'
CMAKE_INSTALL_FULL_SHAREDSTATEDIR='/usr/local/com' CMAKE_INSTALL_FULL_SHAREDSTATEDIR='/usr/local/com'