[Cmake-commits] CMake branch, next, updated. v3.5.0-603-ga48bc38

[Brad King]

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  a48bc382c52dce7a64c53be484388d2c0cdb528a (commit)
       via  fd31feb03f99dad93f3ba14e093480713c1eb3b3 (commit)
      from  43fda57d3d64d6cad11dcccf847e4e4432e0032f (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=a48bc382c52dce7a64c53be484388d2c0cdb528a
commit a48bc382c52dce7a64c53be484388d2c0cdb528a
Merge: 43fda57 fd31feb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 22 14:31:52 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 22 14:31:52 2016 -0400

    Merge topic 'CMakePackageConfigHelpers-relative-prefix' into next
    
    fd31feb0 CMakePackageConfigHelpers: allow to specify a relative CMAKE_INSTALL_PREFIX


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd31feb03f99dad93f3ba14e093480713c1eb3b3
commit fd31feb03f99dad93f3ba14e093480713c1eb3b3
Author:     Sergiu Deitsch <sergiu.deitsch at gmail.com>
AuthorDate: Sat Mar 19 16:21:29 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 22 14:30:01 2016 -0400

    CMakePackageConfigHelpers: allow to specify a relative CMAKE_INSTALL_PREFIX

diff --git a/Modules/CMakePackageConfigHelpers.cmake b/Modules/CMakePackageConfigHelpers.cmake
index 206ea7a..5e5302f 100644
--- a/Modules/CMakePackageConfigHelpers.cmake
+++ b/Modules/CMakePackageConfigHelpers.cmake
@@ -241,8 +241,10 @@ function(CONFIGURE_PACKAGE_CONFIG_FILE _inputFile _outputFile)
     else()
       message(FATAL_ERROR "INSTALL_PREFIX must be an absolute path")
     endif()
-  else()
+  elseif(IS_ABSOLUTE "${CMAKE_INSTALL_PREFIX}")
     set(installPrefix "${CMAKE_INSTALL_PREFIX}")
+  else()
+    get_filename_component(installPrefix "${CMAKE_INSTALL_PREFIX}" ABSOLUTE)
   endif()
 
   if(IS_ABSOLUTE "${CCF_INSTALL_DESTINATION}")

-----------------------------------------------------------------------

Summary of changes:
 Modules/CMakePackageConfigHelpers.cmake |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake