diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-28 13:06:39 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-06-28 13:06:39 (GMT) |
| commit | f91312175822e94d66a92cb919dc04096609a7a7 (patch) | |
| tree | 625a53723ac86e71c00606e5605abe2b4c67bcc6 /Source/cmInstallDirectoryGenerator.cxx | |
| parent | f23d846a971b99ec23bee1ff2afaee845a846e5f (diff) | |
| parent | 059a6ca07a6f8bb4e101e9b269d6bdb4c0281018 (diff) | |
| download | CMake-f91312175822e94d66a92cb919dc04096609a7a7.zip CMake-f91312175822e94d66a92cb919dc04096609a7a7.tar.gz CMake-f91312175822e94d66a92cb919dc04096609a7a7.tar.bz2 | |
Merge topic 'compiler-features'
059a6ca0 Merge branch 'unknown-aliased-target' into compiler-features
1d6909a2 use CM_NULLPTR
b4b73f56 cxx features: add check for nullptr
a7a92390 mark functions with CM_OVERRIDE
9e2d6f0c CM_OVERRIDE: mark destructor overridden in the feature test.
2ca76a66 Validate target name in ALIASED_TARGET property getter
Diffstat (limited to 'Source/cmInstallDirectoryGenerator.cxx')
| -rw-r--r-- | Source/cmInstallDirectoryGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmInstallDirectoryGenerator.cxx b/Source/cmInstallDirectoryGenerator.cxx index 671ab4c..a637b25 100644 --- a/Source/cmInstallDirectoryGenerator.cxx +++ b/Source/cmInstallDirectoryGenerator.cxx @@ -22,7 +22,7 @@ cmInstallDirectoryGenerator::cmInstallDirectoryGenerator( bool optional) : cmInstallGenerator(dest, configurations, component, message, exclude_from_all) - , LocalGenerator(0) + , LocalGenerator(CM_NULLPTR) , Directories(dirs) , FilePermissions(file_permissions) , DirPermissions(dir_permissions) @@ -81,7 +81,7 @@ void cmInstallDirectoryGenerator::AddDirectoryInstallRule( std::vector<std::string> const& dirs) { // Write code to install the directories. - const char* no_rename = 0; + const char* no_rename = CM_NULLPTR; this->AddInstallRule(os, this->GetDestination(config), cmInstallType_DIRECTORY, dirs, this->Optional, this->FilePermissions.c_str(), |