This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via e80f026bd36fbfe70b0d88caa81bed429ca81b11 (commit)
via 0315ab7a31091eda95caac319d42409c24fc6fac (commit)
from 6ec6ac205967a40297e8d3b9c0ca9d27863ef8c5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e80f026bd36fbfe70b0d88caa81bed429ca81b11
commit e80f026bd36fbfe70b0d88caa81bed429ca81b11
Merge: 6ec6ac2 0315ab7
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jan 11 11:54:44 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Jan 11 11:54:44 2017 -0500
Merge topic 'cmake-install-infix' into next
0315ab7a Add installation infix (empty by default)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0315ab7a31091eda95caac319d42409c24fc6fac
commit 0315ab7a31091eda95caac319d42409c24fc6fac
Author: Konstantin Podsvirov <konstan...@podsvirov.pro>
AuthorDate: Wed Jan 11 14:10:39 2017 +0300
Commit: Konstantin Podsvirov <konstan...@podsvirov.pro>
CommitDate: Wed Jan 11 14:10:39 2017 +0300
Add installation infix (empty by default)
diff --git a/Source/CMakeInstallDestinations.cmake
b/Source/CMakeInstallDestinations.cmake
index 023f6c0..28f4e87 100644
--- a/Source/CMakeInstallDestinations.cmake
+++ b/Source/CMakeInstallDestinations.cmake
@@ -25,6 +25,12 @@ set(CMAKE_DOC_DIR_DESC "docs")
set(CMAKE_MAN_DIR_DESC "man pages")
set(CMAKE_XDGDATA_DIR_DESC "XDG specific files")
+set(CMake_INSTALL_INFIX "" CACHE STRING "")
+set_property(CACHE CMake_INSTALL_INFIX PROPERTY HELPSTRING
+ "Intermediate installation path (empty by default)"
+ )
+mark_as_advanced(CMake_INSTALL_INFIX)
+
foreach(v
CMAKE_BIN_DIR
CMAKE_DATA_DIR
@@ -41,7 +47,7 @@ foreach(v
# Use the default when the user did not set this variable.
if(NOT ${v})
- set(${v} "${${v}_DEFAULT}")
+ set(${v} "${CMake_INSTALL_INFIX}${${v}_DEFAULT}")
endif()
# Remove leading slash to treat as relative to install prefix.
string(REGEX REPLACE "^/" "" ${v} "${${v}}")
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeInstallDestinations.cmake | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
