[Cmake-commits] CMake branch, next, updated. v3.0.1-4792-gd54e69b

[Daniele E. Domenichelli]

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  d54e69bbb941449f0e2f44fe7254b0434d472b91 (commit)
       via  b7d5b51714ae41bfd079469075fa7b864f33b5c0 (commit)
       via  9e5178a1d4edbde8627c8f1ba7ce6b2f234f98f8 (commit)
      from  5e24839e32d401f3f975cd4d2a8d0c2f6adf8303 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d54e69bbb941449f0e2f44fe7254b0434d472b91
commit d54e69bbb941449f0e2f44fe7254b0434d472b91
Merge: 5e24839 b7d5b51
Author:     Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
AuthorDate: Thu Aug 7 05:03:07 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 7 05:03:07 2014 -0400

    Merge topic 'CMakePackageConfigHelpers-INSTALL_PREFIX' into next
    
    b7d5b517 CMakePackageConfigHelpers: Ensure that INSTALL_PREFIX is an absolute path
    9e5178a1 fixup! CMakePackageConfigHelpers: Add INSTALL_PREFIX option


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b7d5b51714ae41bfd079469075fa7b864f33b5c0
commit b7d5b51714ae41bfd079469075fa7b864f33b5c0
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Thu Aug 7 10:56:13 2014 +0200
Commit:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Thu Aug 7 11:00:58 2014 +0200

    CMakePackageConfigHelpers: Ensure that INSTALL_PREFIX is an absolute path

diff --git a/Modules/CMakePackageConfigHelpers.cmake b/Modules/CMakePackageConfigHelpers.cmake
index db9b5b0..c6dc141 100644
--- a/Modules/CMakePackageConfigHelpers.cmake
+++ b/Modules/CMakePackageConfigHelpers.cmake
@@ -78,11 +78,12 @@
 # only if the absolute location is a subdirectory of ``INSTALL_PREFIX``.
 #
 # If the ``INSTALL_PREFIX`` argument is passed, this is used as base path to
-# calculate all the relative paths.  If this argument is not passed, the
-# :variable:`CMAKE_INSTALL_PREFIX` variable will be used instead.  The default
-# value is good when generating a FooConfig.cmake file to use your package from
-# the install tree.  When generating a FooConfig.cmake file to use your package
-# from the build tree this option should be used.
+# calculate all the relative paths.  The ``<path>`` argument must be an absolute
+# path.  If this argument is not passed, the :variable:`CMAKE_INSTALL_PREFIX`
+# variable will be used instead.  The default value is good when generating a
+# FooConfig.cmake file to use your package from the install tree.  When
+# generating a FooConfig.cmake file to use your package from the build tree this
+# option should be used.
 #
 # By default ``configure_package_config_file`` also generates two helper macros,
 # ``set_and_check()`` and ``check_required_components()`` into the
@@ -231,7 +232,11 @@ function(CONFIGURE_PACKAGE_CONFIG_FILE _inputFile _outputFile)
   endif()
 
   if(DEFINED CCF_INSTALL_PREFIX)
-    set(installPrefix "${CCF_INSTALL_PREFIX}")
+    if(IS_ABSOLUTE "${CCF_INSTALL_PREFIX}")
+      set(installPrefix "${CCF_INSTALL_PREFIX}")
+    else()
+      message(FATAL_ERROR "INSTALL_PREFIX must be an absolute path")
+    endif()
   else()
     set(installPrefix "${CMAKE_INSTALL_PREFIX}")
   endif()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9e5178a1d4edbde8627c8f1ba7ce6b2f234f98f8
commit 9e5178a1d4edbde8627c8f1ba7ce6b2f234f98f8
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Thu Aug 7 11:00:21 2014 +0200
Commit:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Thu Aug 7 11:00:58 2014 +0200

    fixup! CMakePackageConfigHelpers: Add INSTALL_PREFIX option

diff --git a/Modules/CMakePackageConfigHelpers.cmake b/Modules/CMakePackageConfigHelpers.cmake
index 6534583..db9b5b0 100644
--- a/Modules/CMakePackageConfigHelpers.cmake
+++ b/Modules/CMakePackageConfigHelpers.cmake
@@ -90,7 +90,7 @@
 #
 # ``set_and_check()`` should be used instead of the normal ``set()`` command for
 # setting directories and file locations.  Additionally to setting the variable
-# it also checks that the referenced file or directory actually exists and failsù
+# it also checks that the referenced file or directory actually exists and fails
 # with a ``FATAL_ERROR`` otherwise.  This makes sure that the created
 # ``FooConfig.cmake`` file does not contain wrong references.
 # When using the ``NO_SET_AND_CHECK_MACRO``, this macro is not generated

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

Summary of changes:
 Modules/CMakePackageConfigHelpers.cmake |   19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake