diff options
| author | Brad King <brad.king@kitware.com> | 2021-10-14 11:51:20 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-10-14 11:51:31 (GMT) |
| commit | f40380077ec8a82b5e87041b3411fd172c9af661 (patch) | |
| tree | 603723796bf0f0faaad45a2d3ce50c975187a754 /Source/CPack | |
| parent | fb358544843a56d433a40862faa397a2b0e1f460 (diff) | |
| parent | 09f4edbcefe02239dd175daf198aeac42c3c8bb8 (diff) | |
| download | CMake-f40380077ec8a82b5e87041b3411fd172c9af661.zip CMake-f40380077ec8a82b5e87041b3411fd172c9af661.tar.gz CMake-f40380077ec8a82b5e87041b3411fd172c9af661.tar.bz2 | |
Merge topic 'clang-warnings'
09f4edbcef Fix Clang -Wbitwise-instead-of-logical warnings
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6623
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index 2f700b4..7ddb103 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -186,7 +186,7 @@ int cmCPackGenerator::InstallProject() std::string bareTempInstallDirectory = this->GetOption("CPACK_TEMPORARY_INSTALL_DIRECTORY"); std::string tempInstallDirectoryStr = bareTempInstallDirectory; - bool setDestDir = cmIsOn(this->GetOption("CPACK_SET_DESTDIR")) | + bool setDestDir = cmIsOn(this->GetOption("CPACK_SET_DESTDIR")) || cmIsInternallyOn(this->GetOption("CPACK_SET_DESTDIR")); if (!setDestDir) { tempInstallDirectoryStr += this->GetPackagingInstallPrefix(); |