diff options
| author | Brad King <brad.king@kitware.com> | 2014-08-06 13:26:34 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-08-06 13:26:34 (GMT) |
| commit | e56db93a7b5cb8784cf1f52362684f2d1961372b (patch) | |
| tree | ebacd912d75ed45b2daa962645325cb148c0ad07 | |
| parent | a16a344b4bc2618e4f31a1a4a169c0a378c6b431 (diff) | |
| parent | 2cac483e64835329e4eec2d2fad5001895d0e7fe (diff) | |
| download | CMake-e56db93a7b5cb8784cf1f52362684f2d1961372b.zip CMake-e56db93a7b5cb8784cf1f52362684f2d1961372b.tar.gz CMake-e56db93a7b5cb8784cf1f52362684f2d1961372b.tar.bz2 | |
Merge topic 'fix_value_not_used'
2cac483e Fix used value warning.
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index 9336bed..1461bb1 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -1049,7 +1049,6 @@ int cmCPackGenerator::DoPackage() const char* tempPackageFileName = this->GetOption( "CPACK_TEMPORARY_PACKAGE_FILE_NAME"); - const char* packageFileName = this->GetOption("CPACK_OUTPUT_FILE_PATH"); const char* tempDirectory = this->GetOption("CPACK_TEMPORARY_DIRECTORY"); cmCPackLogger(cmCPackLog::LOG_DEBUG, "Find files" << std::endl); @@ -1114,7 +1113,7 @@ int cmCPackGenerator::DoPackage() std::string tmpPF(this->GetOption("CPACK_OUTPUT_FILE_PREFIX")); tempPackageFileName = it->c_str(); tmpPF += "/"+cmSystemTools::GetFilenameName(*it); - packageFileName = tmpPF.c_str(); + const char* packageFileName = tmpPF.c_str(); cmCPackLogger(cmCPackLog::LOG_DEBUG, "Copy final package(s): " << (tempPackageFileName ? tempPackageFileName : "(NULL)" ) << " to " |