diff options
| author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2016-06-27 20:44:16 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-06-28 13:02:26 (GMT) |
| commit | 1d6909a287bb73b5ec7bf51ec56f7efcf2a869eb (patch) | |
| tree | 3c13e63f2529d877b865475b5269a96ef5e0a4cb /Source/CPack/cmCPackRPMGenerator.cxx | |
| parent | b4b73f56a26c1e1d630e3f262d2d4bafee8231c4 (diff) | |
| download | CMake-1d6909a287bb73b5ec7bf51ec56f7efcf2a869eb.zip CMake-1d6909a287bb73b5ec7bf51ec56f7efcf2a869eb.tar.gz CMake-1d6909a287bb73b5ec7bf51ec56f7efcf2a869eb.tar.bz2 | |
use CM_NULLPTR
Diffstat (limited to 'Source/CPack/cmCPackRPMGenerator.cxx')
| -rw-r--r-- | Source/CPack/cmCPackRPMGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CPack/cmCPackRPMGenerator.cxx b/Source/CPack/cmCPackRPMGenerator.cxx index bc10111..2568d17 100644 --- a/Source/CPack/cmCPackRPMGenerator.cxx +++ b/Source/CPack/cmCPackRPMGenerator.cxx @@ -121,7 +121,7 @@ int cmCPackRPMGenerator::PackageComponents(bool ignoreGroup) for (compIt = this->Components.begin(); compIt != this->Components.end(); ++compIt) { // Does the component belong to a group? - if (compIt->second.Group == NULL) { + if (compIt->second.Group == CM_NULLPTR) { cmCPackLogger( cmCPackLog::LOG_VERBOSE, "Component <" << compIt->second.Name @@ -245,7 +245,7 @@ std::string cmCPackRPMGenerator::GetComponentInstallDirNameSuffix( // the current COMPONENT belongs to. std::string groupVar = "CPACK_COMPONENT_" + cmSystemTools::UpperCase(componentName) + "_GROUP"; - if (NULL != GetOption(groupVar)) { + if (CM_NULLPTR != GetOption(groupVar)) { return std::string(GetOption(groupVar)); } else { return componentName; |