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 23c0c4541e93de093aa53e668206721b138b3996 (commit)
via 561b4baead36227bdd0bf1368c05e4f3d035a083 (commit)
via 3eecc12df06c4a4e62f3366a94acbdcdbf189cd2 (commit)
via 4c28506ac4b4ed2de37072b323cc9d1ee0ade1f3 (commit)
from ec404e5edb34572670543ee8a21882a9d16407fc (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=23c0c4541e93de093aa53e668206721b138b3996
commit 23c0c4541e93de093aa53e668206721b138b3996
Merge: ec404e5 561b4ba
Author: Eric Noulard <eric.noul...@gmail.com>
AuthorDate: Sun Oct 14 08:43:09 2012 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sun Oct 14 08:43:09 2012 -0400
Merge topic 'Fix-XXX_ON_ABSOLUTE_INSTALL_DESTINATION-handling' into next
561b4ba CPACK_XX_ON_ABSOLUTE_INSTALL_DESTINATION is now properly checked
for ON/OFF
3eecc12 CMake Nightly Date Stamp
4c28506 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=561b4baead36227bdd0bf1368c05e4f3d035a083
commit 561b4baead36227bdd0bf1368c05e4f3d035a083
Author: Eric NOULARD <eric.noul...@gmail.com>
AuthorDate: Sun Oct 14 14:36:14 2012 +0200
Commit: Eric NOULARD <eric.noul...@gmail.com>
CommitDate: Sun Oct 14 14:36:14 2012 +0200
CPACK_XX_ON_ABSOLUTE_INSTALL_DESTINATION is now properly checked for ON/OFF
This fixes bug #0013490
diff --git a/Source/CPack/cmCPackGenerator.cxx
b/Source/CPack/cmCPackGenerator.cxx
index f113400..679b8fa 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -855,7 +855,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
// If CPack was asked to warn on ABSOLUTE INSTALL DESTINATION
// then forward request to cmake_install.cmake script
- if (this->GetOption("CPACK_WARN_ON_ABSOLUTE_INSTALL_DESTINATION"))
+ if (this->IsOn("CPACK_WARN_ON_ABSOLUTE_INSTALL_DESTINATION"))
{
mf->AddDefinition("CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION",
"1");
@@ -865,7 +865,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
// then ask cmake_install.cmake script to error out
// as soon as it occurs (before installing file)
if (!SupportsAbsoluteDestination() ||
- this->GetOption("CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION"))
+ this->IsOn("CPACK_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION"))
{
mf->AddDefinition("CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION",
"1");
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeVersion.cmake | 2 +-
Source/CPack/cmCPackGenerator.cxx | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
