diff options
| author | David Cole <david.cole@kitware.com> | 2012-10-17 20:43:44 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-10-17 20:43:44 (GMT) |
| commit | 8bffb8451c9fde6e181542b68ca3acb82002e8ba (patch) | |
| tree | 1b19af7a8d7ee7ccdf11b6d96a80f3d47316e8e2 | |
| parent | a58cd0d7a4550add92367e43fb3b044d85289c3a (diff) | |
| parent | 561b4baead36227bdd0bf1368c05e4f3d035a083 (diff) | |
| download | CMake-8bffb8451c9fde6e181542b68ca3acb82002e8ba.zip CMake-8bffb8451c9fde6e181542b68ca3acb82002e8ba.tar.gz CMake-8bffb8451c9fde6e181542b68ca3acb82002e8ba.tar.bz2 | |
Merge topic 'Fix-XXX_ON_ABSOLUTE_INSTALL_DESTINATION-handling'
561b4ba CPACK_XX_ON_ABSOLUTE_INSTALL_DESTINATION is now properly checked for ON/OFF
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
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"); |