[Cmake-commits] CMake branch, next, updated. v2.8.6-1942-g81df5a6

[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  81df5a65f1e6459ae0e6e82bd030b9acc037ca44 (commit)
       via  72342c1201f963d2cda8e43239ec3efa2b873c59 (commit)
      from  9b7386222cae497cc4fb05242ff50e80a089c8fe (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=81df5a65f1e6459ae0e6e82bd030b9acc037ca44
commit 81df5a65f1e6459ae0e6e82bd030b9acc037ca44
Merge: 9b73862 72342c1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 17 16:40:24 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 17 16:40:24 2011 -0500

    Merge topic 'CheckImportedFileExistenceInConfigDotCMakeFiles' into next
    
    72342c1 Improve formatting of target import failure messages


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=72342c1201f963d2cda8e43239ec3efa2b873c59
commit 72342c1201f963d2cda8e43239ec3efa2b873c59
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 17 16:39:24 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 17 16:39:24 2011 -0500

    Improve formatting of target import failure messages

diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 7777373..c4f5dfb 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -385,19 +385,16 @@ cmExportFileGenerator::GenerateImportedFileCheckLoop(std::ostream& os)
         "FOREACH(target ${_IMPORT_CHECK_TARGETS} )\n"
         "  FOREACH(file ${_IMPORT_CHECK_FILES_FOR_${target}} )\n"
         "    IF(NOT EXISTS \"${file}\" )\n"
-        "      MESSAGE(FATAL_ERROR \"The imported target \\\"${target}\\\" "
-        "references the file \\\"${file}\\\", but this file does not exist. "
-        "There are multiple possible reasons:\n"
-        " * The file \\\"${file}\\\" has been manually "
-        "deleted, renamed or moved to another location.\n"
-        " * A previous install or uninstall procedure did not complete "
-        " successfully.\n"
-        " * The installation package was faulty, and contained\n"
-        "\\\"${CMAKE_CURRENT_LIST_FILE}\\\"\n"
-        "but not\n"
-        "\\\"${file}\\\"\n"
-        "which must always be installed together.\\n\"\n"
-        "             )\n"
+        "      MESSAGE(FATAL_ERROR \"The imported target \\\"${target}\\\""
+        " references the file\n"
+        "   \\\"${file}\\\"\n"
+        "but this file does not exist.  Possible reasons include:\n"
+        "* The file was deleted, renamed, or moved to another location.\n"
+        "* An install or uninstall procedure did not complete successfully.\n"
+        "* The installation package was faulty and contained\n"
+        "   \\\"${CMAKE_CURRENT_LIST_FILE}\\\"\n"
+        "but not all the files it references.\n"
+        "\")\n"
         "    ENDIF()\n"
         "  ENDFOREACH()\n"
         "  UNSET(_IMPORT_CHECK_FILES_FOR_${target})\n"

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

Summary of changes:
 Source/cmExportFileGenerator.cxx |   23 ++++++++++-------------
 1 files changed, 10 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
CMake