[Cmake-commits] CMake branch, next, updated. v2.8.6-1940-g9b73862
Alexander Neundorf
neundorf at kde.org
Thu Nov 17 13:11:37 EST 2011
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 9b7386222cae497cc4fb05242ff50e80a089c8fe (commit)
via ff3e6a5fe0c29c46900be124b615363589999448 (commit)
via 0b8032ffc66a13b5d030940e5836c6cc7a61918a (commit)
from 0555ea34fb72434d5c094945ffaf49f9af5a0c41 (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=9b7386222cae497cc4fb05242ff50e80a089c8fe
commit 9b7386222cae497cc4fb05242ff50e80a089c8fe
Merge: 0555ea3 ff3e6a5
Author: Alexander Neundorf <neundorf at kde.org>
AuthorDate: Thu Nov 17 13:11:35 2011 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 17 13:11:35 2011 -0500
Merge topic 'CheckImportedFileExistenceInConfigDotCMakeFiles' into next
ff3e6a5 -some more tweaks to the error message
0b8032f -check only in installed exports-files for the existance of the files
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff3e6a5fe0c29c46900be124b615363589999448
commit ff3e6a5fe0c29c46900be124b615363589999448
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Thu Nov 17 19:05:36 2011 +0100
Commit: Alex Neundorf <neundorf at kde.org>
CommitDate: Thu Nov 17 19:05:36 2011 +0100
-some more tweaks to the error message
Alex
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index a645464..7777373 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -385,16 +385,18 @@ 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 file \\\"${file}\\\" "
- "for the imported target \\\"${target}\\\" does not exist.\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 run "
- " successfully to its end\n"
- " * the installation package was faulty, and contained \\\""
- "${CMAKE_CURRENT_LIST_FILE}\\\", but not \\\"${file}\\\", which "
- "must always be installed together.\\n\"\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"
" ENDIF()\n"
" ENDFOREACH()\n"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0b8032ffc66a13b5d030940e5836c6cc7a61918a
commit 0b8032ffc66a13b5d030940e5836c6cc7a61918a
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Thu Nov 17 18:52:18 2011 +0100
Commit: Alex Neundorf <neundorf at kde.org>
CommitDate: Thu Nov 17 18:52:18 2011 +0100
-check only in installed exports-files for the existance of the files
With the multi-config generators not necessarily all exported configs
have also been built, so the tests fail.
The idea is actually also only to have this additional verification
for installed packages.
Alex
diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index b754420..1f8a2e2 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -85,12 +85,9 @@ cmExportBuildFileGenerator
// Generate code in the export file.
this->GenerateImportPropertyCode(os, config, target, properties);
- this->GenerateImportedFileChecksCode(os, target, properties,
- importedLocations);
}
}
- this->GenerateImportedFileCheckLoop(os);
}
//----------------------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
Source/cmExportBuildFileGenerator.cxx | 3 ---
Source/cmExportFileGenerator.cxx | 20 +++++++++++---------
2 files changed, 11 insertions(+), 12 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list