Make sure unnused parameters are /*named*/
This commit is contained in:
parent
e240a7c017
commit
e7b842e189
@ -259,7 +259,7 @@ int cmCPackArchiveGenerator::PackageFiles()
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
int cmCPackArchiveGenerator::GenerateHeader(std::ostream*)
|
int cmCPackArchiveGenerator::GenerateHeader(std::ostream* /*unused*/)
|
||||||
{
|
{
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
@ -50,7 +50,7 @@ static const char* cmDocumentationOptions[][2] = {
|
|||||||
{ CM_NULLPTR, CM_NULLPTR }
|
{ CM_NULLPTR, CM_NULLPTR }
|
||||||
};
|
};
|
||||||
|
|
||||||
int cpackUnknownArgument(const char*, void*)
|
int cpackUnknownArgument(const char* /*unused*/, void* /*unused*/)
|
||||||
{
|
{
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
#include <cm_expat.h>
|
#include <cm_expat.h>
|
||||||
|
|
||||||
extern "C" int cmBZRXMLParserUnknownEncodingHandler(void*,
|
extern "C" int cmBZRXMLParserUnknownEncodingHandler(void* /*unused*/,
|
||||||
const XML_Char* name,
|
const XML_Char* name,
|
||||||
XML_Encoding* info)
|
XML_Encoding* info)
|
||||||
{
|
{
|
||||||
@ -215,7 +215,7 @@ private:
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void StartElement(const std::string& name, const char**) CM_OVERRIDE
|
void StartElement(const std::string& name, const char** /*atts*/) CM_OVERRIDE
|
||||||
{
|
{
|
||||||
this->CData.clear();
|
this->CData.clear();
|
||||||
if (name == "log") {
|
if (name == "log") {
|
||||||
@ -275,7 +275,7 @@ private:
|
|||||||
this->CData.clear();
|
this->CData.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
void ReportError(int, int, const char* msg) CM_OVERRIDE
|
void ReportError(int /*line*/, int /*column*/, const char* msg) CM_OVERRIDE
|
||||||
{
|
{
|
||||||
this->BZR->Log << "Error parsing bzr log xml: " << msg << "\n";
|
this->BZR->Log << "Error parsing bzr log xml: " << msg << "\n";
|
||||||
}
|
}
|
||||||
|
@ -123,14 +123,15 @@ int cmCTestBuildAndTestHandler::RunCMake(std::string* outstring,
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CMakeMessageCallback(const char* m, const char*, bool&, void* s)
|
void CMakeMessageCallback(const char* m, const char* /*unused*/,
|
||||||
|
bool& /*unused*/, void* s)
|
||||||
{
|
{
|
||||||
std::string* out = (std::string*)s;
|
std::string* out = (std::string*)s;
|
||||||
*out += m;
|
*out += m;
|
||||||
*out += "\n";
|
*out += "\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
void CMakeProgressCallback(const char* msg, float, void* s)
|
void CMakeProgressCallback(const char* msg, float /*unused*/, void* s)
|
||||||
{
|
{
|
||||||
std::string* out = (std::string*)s;
|
std::string* out = (std::string*)s;
|
||||||
*out += msg;
|
*out += msg;
|
||||||
|
@ -54,8 +54,8 @@ static size_t curlWriteMemoryCallback(void* ptr, size_t size, size_t nmemb,
|
|||||||
return realsize;
|
return realsize;
|
||||||
}
|
}
|
||||||
|
|
||||||
static size_t curlDebugCallback(CURL*, curl_infotype, char* chPtr, size_t size,
|
static size_t curlDebugCallback(CURL* /*unused*/, curl_infotype /*unused*/,
|
||||||
void* data)
|
char* chPtr, size_t size, void* data)
|
||||||
{
|
{
|
||||||
std::vector<char>* vec = static_cast<std::vector<char>*>(data);
|
std::vector<char>* vec = static_cast<std::vector<char>*>(data);
|
||||||
vec->insert(vec->end(), chPtr, chPtr + size);
|
vec->insert(vec->end(), chPtr, chPtr + size);
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
#include "cmCTestScriptHandler.h"
|
#include "cmCTestScriptHandler.h"
|
||||||
|
|
||||||
bool cmCTestEmptyBinaryDirectoryCommand::InitialPass(
|
bool cmCTestEmptyBinaryDirectoryCommand::InitialPass(
|
||||||
std::vector<std::string> const& args, cmExecutionStatus&)
|
std::vector<std::string> const& args, cmExecutionStatus& /*unused*/)
|
||||||
{
|
{
|
||||||
if (args.size() != 1) {
|
if (args.size() != 1) {
|
||||||
this->SetError("called with incorrect number of arguments");
|
this->SetError("called with incorrect number of arguments");
|
||||||
|
@ -261,7 +261,7 @@ private:
|
|||||||
return output;
|
return output;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ReportError(int, int, const char* msg) CM_OVERRIDE
|
void ReportError(int /*line*/, int /*column*/, const char* msg) CM_OVERRIDE
|
||||||
{
|
{
|
||||||
this->HG->Log << "Error parsing hg log xml: " << msg << "\n";
|
this->HG->Log << "Error parsing hg log xml: " << msg << "\n";
|
||||||
}
|
}
|
||||||
|
@ -32,7 +32,7 @@ cmCTestHandlerCommand::cmCTestHandlerCommand()
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool cmCTestHandlerCommand::InitialPass(std::vector<std::string> const& args,
|
bool cmCTestHandlerCommand::InitialPass(std::vector<std::string> const& args,
|
||||||
cmExecutionStatus&)
|
cmExecutionStatus& /*unused*/)
|
||||||
{
|
{
|
||||||
// Allocate space for argument values.
|
// Allocate space for argument values.
|
||||||
this->Values.clear();
|
this->Values.clear();
|
||||||
|
@ -78,7 +78,7 @@ public:
|
|||||||
ostr << "\n";
|
ostr << "\n";
|
||||||
this->Log += ostr.str();
|
this->Log += ostr.str();
|
||||||
}
|
}
|
||||||
void EndElement(const std::string&) CM_OVERRIDE {}
|
void EndElement(const std::string& /*name*/) CM_OVERRIDE {}
|
||||||
|
|
||||||
const char* GetAttribute(const char* name, const char** atts)
|
const char* GetAttribute(const char* name, const char** atts)
|
||||||
{
|
{
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
#include "cmCTest.h"
|
#include "cmCTest.h"
|
||||||
|
|
||||||
bool cmCTestReadCustomFilesCommand::InitialPass(
|
bool cmCTestReadCustomFilesCommand::InitialPass(
|
||||||
std::vector<std::string> const& args, cmExecutionStatus&)
|
std::vector<std::string> const& args, cmExecutionStatus& /*unused*/)
|
||||||
{
|
{
|
||||||
if (args.empty()) {
|
if (args.empty()) {
|
||||||
this->SetError("called with incorrect number of arguments");
|
this->SetError("called with incorrect number of arguments");
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
#include "cmCTestScriptHandler.h"
|
#include "cmCTestScriptHandler.h"
|
||||||
|
|
||||||
bool cmCTestRunScriptCommand::InitialPass(std::vector<std::string> const& args,
|
bool cmCTestRunScriptCommand::InitialPass(std::vector<std::string> const& args,
|
||||||
cmExecutionStatus&)
|
cmExecutionStatus& /*unused*/)
|
||||||
{
|
{
|
||||||
if (args.empty()) {
|
if (args.empty()) {
|
||||||
this->CTestScriptHandler->RunCurrentScript();
|
this->CTestScriptHandler->RunCurrentScript();
|
||||||
|
@ -372,7 +372,7 @@ private:
|
|||||||
this->CData.clear();
|
this->CData.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
void ReportError(int, int, const char* msg) CM_OVERRIDE
|
void ReportError(int /*line*/, int /*column*/, const char* msg) CM_OVERRIDE
|
||||||
{
|
{
|
||||||
this->SVN->Log << "Error parsing svn log xml: " << msg << "\n";
|
this->SVN->Log << "Error parsing svn log xml: " << msg << "\n";
|
||||||
}
|
}
|
||||||
|
@ -61,7 +61,7 @@ public:
|
|||||||
cmCTestScriptFunctionBlocker() {}
|
cmCTestScriptFunctionBlocker() {}
|
||||||
~cmCTestScriptFunctionBlocker() CM_OVERRIDE {}
|
~cmCTestScriptFunctionBlocker() CM_OVERRIDE {}
|
||||||
bool IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile& mf,
|
bool IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile& mf,
|
||||||
cmExecutionStatus&) CM_OVERRIDE;
|
cmExecutionStatus& /*status*/) CM_OVERRIDE;
|
||||||
// virtual bool ShouldRemove(const cmListFileFunction& lff, cmMakefile &mf);
|
// virtual bool ShouldRemove(const cmListFileFunction& lff, cmMakefile &mf);
|
||||||
// virtual void ScopeEnded(cmMakefile &mf);
|
// virtual void ScopeEnded(cmMakefile &mf);
|
||||||
|
|
||||||
@ -69,9 +69,9 @@ public:
|
|||||||
};
|
};
|
||||||
|
|
||||||
// simply update the time and don't block anything
|
// simply update the time and don't block anything
|
||||||
bool cmCTestScriptFunctionBlocker::IsFunctionBlocked(const cmListFileFunction&,
|
bool cmCTestScriptFunctionBlocker::IsFunctionBlocked(
|
||||||
cmMakefile&,
|
const cmListFileFunction& /*lff*/, cmMakefile& /*mf*/,
|
||||||
cmExecutionStatus&)
|
cmExecutionStatus& /*status*/)
|
||||||
{
|
{
|
||||||
this->CTestScriptHandler->UpdateElapsedTime();
|
this->CTestScriptHandler->UpdateElapsedTime();
|
||||||
return false;
|
return false;
|
||||||
@ -265,7 +265,8 @@ int cmCTestScriptHandler::ExecuteScript(const std::string& total_script_arg)
|
|||||||
return retVal;
|
return retVal;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void ctestScriptProgressCallback(const char* m, float, void* cd)
|
static void ctestScriptProgressCallback(const char* m, float /*unused*/,
|
||||||
|
void* cd)
|
||||||
{
|
{
|
||||||
cmCTest* ctest = static_cast<cmCTest*>(cd);
|
cmCTest* ctest = static_cast<cmCTest*>(cd);
|
||||||
if (m && *m) {
|
if (m && *m) {
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
#include <stdlib.h> // required for atoi
|
#include <stdlib.h> // required for atoi
|
||||||
|
|
||||||
bool cmCTestSleepCommand::InitialPass(std::vector<std::string> const& args,
|
bool cmCTestSleepCommand::InitialPass(std::vector<std::string> const& args,
|
||||||
cmExecutionStatus&)
|
cmExecutionStatus& /*unused*/)
|
||||||
{
|
{
|
||||||
if (args.empty()) {
|
if (args.empty()) {
|
||||||
this->SetError("called with incorrect number of arguments");
|
this->SetError("called with incorrect number of arguments");
|
||||||
|
@ -23,7 +23,7 @@ cmCTestStartCommand::cmCTestStartCommand()
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool cmCTestStartCommand::InitialPass(std::vector<std::string> const& args,
|
bool cmCTestStartCommand::InitialPass(std::vector<std::string> const& args,
|
||||||
cmExecutionStatus&)
|
cmExecutionStatus& /*unused*/)
|
||||||
{
|
{
|
||||||
if (args.empty()) {
|
if (args.empty()) {
|
||||||
this->SetError("called with incorrect number of arguments");
|
this->SetError("called with incorrect number of arguments");
|
||||||
|
@ -116,7 +116,8 @@ static size_t cmCTestSubmitHandlerWriteMemoryCallback(void* ptr, size_t size,
|
|||||||
return realsize;
|
return realsize;
|
||||||
}
|
}
|
||||||
|
|
||||||
static size_t cmCTestSubmitHandlerCurlDebugCallback(CURL*, curl_infotype,
|
static size_t cmCTestSubmitHandlerCurlDebugCallback(CURL* /*unused*/,
|
||||||
|
curl_infotype /*unused*/,
|
||||||
char* chPtr, size_t size,
|
char* chPtr, size_t size,
|
||||||
void* data)
|
void* data)
|
||||||
{
|
{
|
||||||
@ -976,10 +977,9 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
bool cmCTestSubmitHandler::SubmitUsingXMLRPC(std::string const&,
|
bool cmCTestSubmitHandler::SubmitUsingXMLRPC(
|
||||||
std::set<std::string> const&,
|
std::string const& /*unused*/, std::set<std::string> const& /*unused*/,
|
||||||
std::string const&,
|
std::string const& /*unused*/, std::string const& /*unused*/)
|
||||||
std::string const&)
|
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -54,7 +54,7 @@ public:
|
|||||||
* the CMakeLists.txt file.
|
* the CMakeLists.txt file.
|
||||||
*/
|
*/
|
||||||
bool InitialPass(std::vector<std::string> const& args,
|
bool InitialPass(std::vector<std::string> const& args,
|
||||||
cmExecutionStatus&) CM_OVERRIDE;
|
cmExecutionStatus& /*unused*/) CM_OVERRIDE;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The name of the command as specified in CMakeList.txt.
|
* The name of the command as specified in CMakeList.txt.
|
||||||
@ -67,7 +67,7 @@ public:
|
|||||||
};
|
};
|
||||||
|
|
||||||
bool cmCTestSubdirCommand::InitialPass(std::vector<std::string> const& args,
|
bool cmCTestSubdirCommand::InitialPass(std::vector<std::string> const& args,
|
||||||
cmExecutionStatus&)
|
cmExecutionStatus& /*unused*/)
|
||||||
{
|
{
|
||||||
if (args.empty()) {
|
if (args.empty()) {
|
||||||
this->SetError("called with incorrect number of arguments");
|
this->SetError("called with incorrect number of arguments");
|
||||||
@ -135,7 +135,7 @@ public:
|
|||||||
* the CMakeLists.txt file.
|
* the CMakeLists.txt file.
|
||||||
*/
|
*/
|
||||||
bool InitialPass(std::vector<std::string> const& args,
|
bool InitialPass(std::vector<std::string> const& args,
|
||||||
cmExecutionStatus&) CM_OVERRIDE;
|
cmExecutionStatus& /*unused*/) CM_OVERRIDE;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The name of the command as specified in CMakeList.txt.
|
* The name of the command as specified in CMakeList.txt.
|
||||||
@ -148,7 +148,7 @@ public:
|
|||||||
};
|
};
|
||||||
|
|
||||||
bool cmCTestAddSubdirectoryCommand::InitialPass(
|
bool cmCTestAddSubdirectoryCommand::InitialPass(
|
||||||
std::vector<std::string> const& args, cmExecutionStatus&)
|
std::vector<std::string> const& args, cmExecutionStatus& /*unused*/)
|
||||||
{
|
{
|
||||||
if (args.empty()) {
|
if (args.empty()) {
|
||||||
this->SetError("called with incorrect number of arguments");
|
this->SetError("called with incorrect number of arguments");
|
||||||
@ -208,8 +208,8 @@ public:
|
|||||||
* This is called when the command is first encountered in
|
* This is called when the command is first encountered in
|
||||||
* the CMakeLists.txt file.
|
* the CMakeLists.txt file.
|
||||||
*/
|
*/
|
||||||
bool InitialPass(std::vector<std::string> const&,
|
bool InitialPass(std::vector<std::string> const& /*args*/,
|
||||||
cmExecutionStatus&) CM_OVERRIDE;
|
cmExecutionStatus& /*unused*/) CM_OVERRIDE;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The name of the command as specified in CMakeList.txt.
|
* The name of the command as specified in CMakeList.txt.
|
||||||
@ -222,7 +222,7 @@ public:
|
|||||||
};
|
};
|
||||||
|
|
||||||
bool cmCTestAddTestCommand::InitialPass(std::vector<std::string> const& args,
|
bool cmCTestAddTestCommand::InitialPass(std::vector<std::string> const& args,
|
||||||
cmExecutionStatus&)
|
cmExecutionStatus& /*unused*/)
|
||||||
{
|
{
|
||||||
if (args.size() < 2) {
|
if (args.size() < 2) {
|
||||||
this->SetError("called with incorrect number of arguments");
|
this->SetError("called with incorrect number of arguments");
|
||||||
@ -248,8 +248,8 @@ public:
|
|||||||
* This is called when the command is first encountered in
|
* This is called when the command is first encountered in
|
||||||
* the CMakeLists.txt file.
|
* the CMakeLists.txt file.
|
||||||
*/
|
*/
|
||||||
bool InitialPass(std::vector<std::string> const&,
|
bool InitialPass(std::vector<std::string> const& /*args*/,
|
||||||
cmExecutionStatus&) CM_OVERRIDE;
|
cmExecutionStatus& /*unused*/) CM_OVERRIDE;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The name of the command as specified in CMakeList.txt.
|
* The name of the command as specified in CMakeList.txt.
|
||||||
@ -262,7 +262,7 @@ public:
|
|||||||
};
|
};
|
||||||
|
|
||||||
bool cmCTestSetTestsPropertiesCommand::InitialPass(
|
bool cmCTestSetTestsPropertiesCommand::InitialPass(
|
||||||
std::vector<std::string> const& args, cmExecutionStatus&)
|
std::vector<std::string> const& args, cmExecutionStatus& /*unused*/)
|
||||||
{
|
{
|
||||||
return this->TestHandler->SetTestsProperties(args);
|
return this->TestHandler->SetTestsProperties(args);
|
||||||
}
|
}
|
||||||
@ -986,7 +986,8 @@ void cmCTestTestHandler::ProcessDirectory(std::vector<std::string>& passed,
|
|||||||
*this->LogFile << "End testing: " << this->CTest->CurrentTime() << std::endl;
|
*this->LogFile << "End testing: " << this->CTest->CurrentTime() << std::endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
void cmCTestTestHandler::GenerateTestCommand(std::vector<std::string>&, int)
|
void cmCTestTestHandler::GenerateTestCommand(
|
||||||
|
std::vector<std::string>& /*unused*/, int /*unused*/)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -185,7 +185,7 @@ bool cmCTestVC::WriteXML(cmXMLWriter& xml)
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool cmCTestVC::WriteXMLUpdates(cmXMLWriter&)
|
bool cmCTestVC::WriteXMLUpdates(cmXMLWriter& /*unused*/)
|
||||||
{
|
{
|
||||||
cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
|
cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
|
||||||
"* CTest cannot extract updates for this VCS tool.\n");
|
"* CTest cannot extract updates for this VCS tool.\n");
|
||||||
|
@ -23,7 +23,7 @@ public:
|
|||||||
~XMLParser() CM_OVERRIDE {}
|
~XMLParser() CM_OVERRIDE {}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void EndElement(const std::string&) CM_OVERRIDE {}
|
void EndElement(const std::string& /*name*/) CM_OVERRIDE {}
|
||||||
|
|
||||||
void StartElement(const std::string& name, const char** atts) CM_OVERRIDE
|
void StartElement(const std::string& name, const char** atts) CM_OVERRIDE
|
||||||
{
|
{
|
||||||
|
@ -51,7 +51,7 @@ cmCursesForm* cmCursesForm::CurrentForm = CM_NULLPTR;
|
|||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
|
||||||
void onsig(int)
|
void onsig(int /*unused*/)
|
||||||
{
|
{
|
||||||
if (cmCursesForm::CurrentForm) {
|
if (cmCursesForm::CurrentForm) {
|
||||||
endwin();
|
endwin();
|
||||||
@ -70,8 +70,8 @@ void onsig(int)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void CMakeMessageHandler(const char* message, const char* title, bool&,
|
void CMakeMessageHandler(const char* message, const char* title,
|
||||||
void* clientData)
|
bool& /*unused*/, void* clientData)
|
||||||
{
|
{
|
||||||
cmCursesForm* self = static_cast<cmCursesForm*>(clientData);
|
cmCursesForm* self = static_cast<cmCursesForm*>(clientData);
|
||||||
self->AddError(message, title);
|
self->AddError(message, title);
|
||||||
|
@ -24,7 +24,8 @@ cmCursesBoolWidget::cmCursesBoolWidget(int width, int height, int left,
|
|||||||
this->SetValueAsBool(false);
|
this->SetValueAsBool(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool cmCursesBoolWidget::HandleInput(int& key, cmCursesMainForm*, WINDOW* w)
|
bool cmCursesBoolWidget::HandleInput(int& key, cmCursesMainForm* /*fm*/,
|
||||||
|
WINDOW* w)
|
||||||
{
|
{
|
||||||
|
|
||||||
// toggle boolean values with enter or space
|
// toggle boolean values with enter or space
|
||||||
|
@ -18,7 +18,8 @@ cmCursesDummyWidget::cmCursesDummyWidget(int width, int height, int left,
|
|||||||
this->Type = cmState::INTERNAL;
|
this->Type = cmState::INTERNAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool cmCursesDummyWidget::HandleInput(int&, cmCursesMainForm*, WINDOW*)
|
bool cmCursesDummyWidget::HandleInput(int& /*key*/, cmCursesMainForm* /*fm*/,
|
||||||
|
WINDOW* /*w*/)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -25,7 +25,8 @@ cmCursesLabelWidget::~cmCursesLabelWidget()
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
bool cmCursesLabelWidget::HandleInput(int&, cmCursesMainForm*, WINDOW*)
|
bool cmCursesLabelWidget::HandleInput(int& /*key*/, cmCursesMainForm* /*fm*/,
|
||||||
|
WINDOW* /*w*/)
|
||||||
{
|
{
|
||||||
// Static text. No input is handled here.
|
// Static text. No input is handled here.
|
||||||
return false;
|
return false;
|
||||||
|
@ -102,7 +102,8 @@ void cmCursesLongMessageForm::PrintKeys()
|
|||||||
pos_form_cursor(this->Form);
|
pos_form_cursor(this->Form);
|
||||||
}
|
}
|
||||||
|
|
||||||
void cmCursesLongMessageForm::Render(int, int, int, int)
|
void cmCursesLongMessageForm::Render(int /*left*/, int /*top*/, int /*width*/,
|
||||||
|
int /*height*/)
|
||||||
{
|
{
|
||||||
int x, y;
|
int x, y;
|
||||||
getmaxyx(stdscr, y, x);
|
getmaxyx(stdscr, y, x);
|
||||||
|
@ -675,7 +675,7 @@ int cmCursesMainForm::Generate()
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void cmCursesMainForm::AddError(const char* message, const char*)
|
void cmCursesMainForm::AddError(const char* message, const char* /*unused*/)
|
||||||
{
|
{
|
||||||
this->Errors.push_back(message);
|
this->Errors.push_back(message);
|
||||||
}
|
}
|
||||||
@ -1028,7 +1028,7 @@ void cmCursesMainForm::HandleInput()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int cmCursesMainForm::LoadCache(const char*)
|
int cmCursesMainForm::LoadCache(const char* /*unused*/)
|
||||||
|
|
||||||
{
|
{
|
||||||
int r = this->CMakeInstance->LoadCache();
|
int r = this->CMakeInstance->LoadCache();
|
||||||
|
@ -31,7 +31,8 @@ cmCursesOptionsWidget::cmCursesOptionsWidget(int width, int height, int left,
|
|||||||
field_opts_off(this->Field, O_STATIC);
|
field_opts_off(this->Field, O_STATIC);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool cmCursesOptionsWidget::HandleInput(int& key, cmCursesMainForm*, WINDOW* w)
|
bool cmCursesOptionsWidget::HandleInput(int& key, cmCursesMainForm* /*fm*/,
|
||||||
|
WINDOW* w)
|
||||||
{
|
{
|
||||||
|
|
||||||
// 10 == enter
|
// 10 == enter
|
||||||
|
@ -29,12 +29,13 @@ cmCursesStringWidget::cmCursesStringWidget(int width, int height, int left,
|
|||||||
field_opts_off(this->Field, O_STATIC);
|
field_opts_off(this->Field, O_STATIC);
|
||||||
}
|
}
|
||||||
|
|
||||||
void cmCursesStringWidget::OnTab(cmCursesMainForm*, WINDOW*)
|
void cmCursesStringWidget::OnTab(cmCursesMainForm* /*unused*/,
|
||||||
|
WINDOW* /*unused*/)
|
||||||
{
|
{
|
||||||
// FORM* form = fm->GetForm();
|
// FORM* form = fm->GetForm();
|
||||||
}
|
}
|
||||||
|
|
||||||
void cmCursesStringWidget::OnReturn(cmCursesMainForm* fm, WINDOW*)
|
void cmCursesStringWidget::OnReturn(cmCursesMainForm* fm, WINDOW* /*unused*/)
|
||||||
{
|
{
|
||||||
FORM* form = fm->GetForm();
|
FORM* form = fm->GetForm();
|
||||||
if (this->InEdit) {
|
if (this->InEdit) {
|
||||||
@ -56,7 +57,8 @@ void cmCursesStringWidget::OnReturn(cmCursesMainForm* fm, WINDOW*)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void cmCursesStringWidget::OnType(int& key, cmCursesMainForm* fm, WINDOW*)
|
void cmCursesStringWidget::OnType(int& key, cmCursesMainForm* fm,
|
||||||
|
WINDOW* /*unused*/)
|
||||||
{
|
{
|
||||||
form_driver(fm->GetForm(), key);
|
form_driver(fm->GetForm(), key);
|
||||||
}
|
}
|
||||||
|
@ -64,7 +64,8 @@ public:
|
|||||||
struct cmArchiveWrite::Callback
|
struct cmArchiveWrite::Callback
|
||||||
{
|
{
|
||||||
// archive_write_callback
|
// archive_write_callback
|
||||||
static __LA_SSIZE_T Write(struct archive*, void* cd, const void* b, size_t n)
|
static __LA_SSIZE_T Write(struct archive* /*unused*/, void* cd,
|
||||||
|
const void* b, size_t n)
|
||||||
{
|
{
|
||||||
cmArchiveWrite* self = static_cast<cmArchiveWrite*>(cd);
|
cmArchiveWrite* self = static_cast<cmArchiveWrite*>(cd);
|
||||||
if (self->Stream.write(static_cast<const char*>(b),
|
if (self->Stream.write(static_cast<const char*>(b),
|
||||||
|
@ -72,7 +72,7 @@ bool cmDepends::Write(std::ostream& makeDepends, std::ostream& internalDepends)
|
|||||||
return this->Finalize(makeDepends, internalDepends);
|
return this->Finalize(makeDepends, internalDepends);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool cmDepends::Finalize(std::ostream&, std::ostream&)
|
bool cmDepends::Finalize(std::ostream& /*unused*/, std::ostream& /*unused*/)
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -123,9 +123,10 @@ void cmDepends::Clear(const char* file)
|
|||||||
<< std::endl;
|
<< std::endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool cmDepends::WriteDependencies(const std::set<std::string>&,
|
bool cmDepends::WriteDependencies(const std::set<std::string>& /*unused*/,
|
||||||
const std::string&, std::ostream&,
|
const std::string& /*unused*/,
|
||||||
std::ostream&)
|
std::ostream& /*unused*/,
|
||||||
|
std::ostream& /*unused*/)
|
||||||
{
|
{
|
||||||
// This should be implemented by the subclass.
|
// This should be implemented by the subclass.
|
||||||
return false;
|
return false;
|
||||||
|
@ -91,8 +91,9 @@ cmDependsFortran::~cmDependsFortran()
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool cmDependsFortran::WriteDependencies(const std::set<std::string>& sources,
|
bool cmDependsFortran::WriteDependencies(const std::set<std::string>& sources,
|
||||||
const std::string& obj, std::ostream&,
|
const std::string& obj,
|
||||||
std::ostream&)
|
std::ostream& /*makeDepends*/,
|
||||||
|
std::ostream& /*internalDepends*/)
|
||||||
{
|
{
|
||||||
// Make sure this is a scanning instance.
|
// Make sure this is a scanning instance.
|
||||||
if (sources.empty() || sources.begin()->empty()) {
|
if (sources.empty() || sources.begin()->empty()) {
|
||||||
|
@ -23,8 +23,9 @@ cmDependsJava::~cmDependsJava()
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool cmDependsJava::WriteDependencies(const std::set<std::string>& sources,
|
bool cmDependsJava::WriteDependencies(const std::set<std::string>& sources,
|
||||||
const std::string&, std::ostream&,
|
const std::string& /*obj*/,
|
||||||
std::ostream&)
|
std::ostream& /*makeDepends*/,
|
||||||
|
std::ostream& /*internalDepends*/)
|
||||||
{
|
{
|
||||||
// Make sure this is a scanning instance.
|
// Make sure this is a scanning instance.
|
||||||
if (sources.empty() || sources.begin()->empty()) {
|
if (sources.empty() || sources.begin()->empty()) {
|
||||||
@ -35,8 +36,9 @@ bool cmDependsJava::WriteDependencies(const std::set<std::string>& sources,
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool cmDependsJava::CheckDependencies(std::istream&, const char*,
|
bool cmDependsJava::CheckDependencies(
|
||||||
std::map<std::string, DependencyVector>&)
|
std::istream& /*internalDepends*/, const char* /*internalDependsFileName*/,
|
||||||
|
std::map<std::string, DependencyVector>& /*validDeps*/)
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -15,8 +15,10 @@ class cmDynamicLoaderCache
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
~cmDynamicLoaderCache();
|
~cmDynamicLoaderCache();
|
||||||
void CacheFile(const char* path, const cmsys::DynamicLoader::LibraryHandle&);
|
void CacheFile(const char* path,
|
||||||
bool GetCacheFile(const char* path, cmsys::DynamicLoader::LibraryHandle&);
|
const cmsys::DynamicLoader::LibraryHandle& /*p*/);
|
||||||
|
bool GetCacheFile(const char* path,
|
||||||
|
cmsys::DynamicLoader::LibraryHandle& /*p*/);
|
||||||
bool FlushCache(const char* path);
|
bool FlushCache(const char* path);
|
||||||
void FlushCache();
|
void FlushCache();
|
||||||
static cmDynamicLoaderCache* GetInstance();
|
static cmDynamicLoaderCache* GetInstance();
|
||||||
|
@ -55,17 +55,17 @@ template <size_t s>
|
|||||||
struct cmELFByteSwapSize
|
struct cmELFByteSwapSize
|
||||||
{
|
{
|
||||||
};
|
};
|
||||||
void cmELFByteSwap(char*, cmELFByteSwapSize<1> const&)
|
void cmELFByteSwap(char* /*unused*/, cmELFByteSwapSize<1> const& /*unused*/)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
void cmELFByteSwap(char* data, cmELFByteSwapSize<2> const&)
|
void cmELFByteSwap(char* data, cmELFByteSwapSize<2> const& /*unused*/)
|
||||||
{
|
{
|
||||||
char one_byte;
|
char one_byte;
|
||||||
one_byte = data[0];
|
one_byte = data[0];
|
||||||
data[0] = data[1];
|
data[0] = data[1];
|
||||||
data[1] = one_byte;
|
data[1] = one_byte;
|
||||||
}
|
}
|
||||||
void cmELFByteSwap(char* data, cmELFByteSwapSize<4> const&)
|
void cmELFByteSwap(char* data, cmELFByteSwapSize<4> const& /*unused*/)
|
||||||
{
|
{
|
||||||
char one_byte;
|
char one_byte;
|
||||||
one_byte = data[0];
|
one_byte = data[0];
|
||||||
@ -75,7 +75,7 @@ void cmELFByteSwap(char* data, cmELFByteSwapSize<4> const&)
|
|||||||
data[1] = data[2];
|
data[1] = data[2];
|
||||||
data[2] = one_byte;
|
data[2] = one_byte;
|
||||||
}
|
}
|
||||||
void cmELFByteSwap(char* data, cmELFByteSwapSize<8> const&)
|
void cmELFByteSwap(char* data, cmELFByteSwapSize<8> const& /*unused*/)
|
||||||
{
|
{
|
||||||
char one_byte;
|
char one_byte;
|
||||||
one_byte = data[0];
|
one_byte = data[0];
|
||||||
|
@ -679,7 +679,7 @@ void cmExportFileGenerator::ResolveTargetsInGeneratorExpression(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void cmExportFileGenerator::ReplaceInstallPrefix(std::string&)
|
void cmExportFileGenerator::ReplaceInstallPrefix(std::string& /*unused*/)
|
||||||
{
|
{
|
||||||
// Do nothing
|
// Do nothing
|
||||||
}
|
}
|
||||||
|
@ -468,7 +468,7 @@ void cmExportInstallFileGenerator::ComplainAboutMissingTarget(
|
|||||||
}
|
}
|
||||||
|
|
||||||
std::string cmExportInstallFileGenerator::InstallNameDir(
|
std::string cmExportInstallFileGenerator::InstallNameDir(
|
||||||
cmGeneratorTarget* target, const std::string&)
|
cmGeneratorTarget* target, const std::string& /*config*/)
|
||||||
{
|
{
|
||||||
std::string install_name_dir;
|
std::string install_name_dir;
|
||||||
|
|
||||||
|
@ -15,7 +15,8 @@
|
|||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
void cmExternalMakefileProjectGenerator::EnableLanguage(
|
void cmExternalMakefileProjectGenerator::EnableLanguage(
|
||||||
std::vector<std::string> const&, cmMakefile*, bool)
|
std::vector<std::string> const& /*unused*/, cmMakefile* /*unused*/,
|
||||||
|
bool /*unused*/)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -77,7 +77,8 @@ cmExtraEclipseCDT4Generator::GetFactory()
|
|||||||
}
|
}
|
||||||
|
|
||||||
void cmExtraEclipseCDT4Generator::EnableLanguage(
|
void cmExtraEclipseCDT4Generator::EnableLanguage(
|
||||||
std::vector<std::string> const& languages, cmMakefile*, bool)
|
std::vector<std::string> const& languages, cmMakefile* /*unused*/,
|
||||||
|
bool /*optional*/)
|
||||||
{
|
{
|
||||||
for (std::vector<std::string>::const_iterator lit = languages.begin();
|
for (std::vector<std::string>::const_iterator lit = languages.begin();
|
||||||
lit != languages.end(); ++lit) {
|
lit != languages.end(); ++lit) {
|
||||||
|
@ -206,8 +206,7 @@ void cmExtraSublimeTextGenerator::AppendAllTargets(
|
|||||||
void cmExtraSublimeTextGenerator::AppendTarget(
|
void cmExtraSublimeTextGenerator::AppendTarget(
|
||||||
cmGeneratedFileStream& fout, const std::string& targetName,
|
cmGeneratedFileStream& fout, const std::string& targetName,
|
||||||
cmLocalGenerator* lg, cmGeneratorTarget* target, const char* make,
|
cmLocalGenerator* lg, cmGeneratorTarget* target, const char* make,
|
||||||
const cmMakefile* makefile,
|
const cmMakefile* makefile, const char* /*compiler*/,
|
||||||
const char*, // compiler
|
|
||||||
MapSourceFileFlags& sourceFileFlags, bool firstTarget)
|
MapSourceFileFlags& sourceFileFlags, bool firstTarget)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
@ -161,7 +161,7 @@ int cmFortranParser_GetOldStartcond(cmFortranParser* parser)
|
|||||||
return parser->OldStartcond;
|
return parser->OldStartcond;
|
||||||
}
|
}
|
||||||
|
|
||||||
void cmFortranParser_Error(cmFortranParser*, const char*)
|
void cmFortranParser_Error(cmFortranParser* /*unused*/, const char* /*unused*/)
|
||||||
{
|
{
|
||||||
// If there is a parser error just ignore it. The source will not
|
// If there is a parser error just ignore it. The source will not
|
||||||
// compile and the user will edit it. Then dependencies will have
|
// compile and the user will edit it. Then dependencies will have
|
||||||
|
@ -198,7 +198,7 @@ enum TransitiveProperty
|
|||||||
};
|
};
|
||||||
|
|
||||||
template <TransitiveProperty>
|
template <TransitiveProperty>
|
||||||
bool additionalTest(const char* const)
|
bool additionalTest(const char* const /*unused*/)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -46,10 +46,11 @@ static const struct ZeroNode : public cmGeneratorExpressionNode
|
|||||||
|
|
||||||
bool AcceptsArbitraryContentParameter() const CM_OVERRIDE { return true; }
|
bool AcceptsArbitraryContentParameter() const CM_OVERRIDE { return true; }
|
||||||
|
|
||||||
std::string Evaluate(const std::vector<std::string>&,
|
std::string Evaluate(const std::vector<std::string>& /*parameters*/,
|
||||||
cmGeneratorExpressionContext*,
|
cmGeneratorExpressionContext* /*context*/,
|
||||||
const GeneratorExpressionContent*,
|
const GeneratorExpressionContent* /*content*/,
|
||||||
cmGeneratorExpressionDAGChecker*) const CM_OVERRIDE
|
cmGeneratorExpressionDAGChecker* /*dagChecker*/) const
|
||||||
|
CM_OVERRIDE
|
||||||
{
|
{
|
||||||
return std::string();
|
return std::string();
|
||||||
}
|
}
|
||||||
@ -62,9 +63,10 @@ static const struct OneNode : public cmGeneratorExpressionNode
|
|||||||
bool AcceptsArbitraryContentParameter() const CM_OVERRIDE { return true; }
|
bool AcceptsArbitraryContentParameter() const CM_OVERRIDE { return true; }
|
||||||
|
|
||||||
std::string Evaluate(const std::vector<std::string>& parameters,
|
std::string Evaluate(const std::vector<std::string>& parameters,
|
||||||
cmGeneratorExpressionContext*,
|
cmGeneratorExpressionContext* /*context*/,
|
||||||
const GeneratorExpressionContent*,
|
const GeneratorExpressionContent* /*content*/,
|
||||||
cmGeneratorExpressionDAGChecker*) const CM_OVERRIDE
|
cmGeneratorExpressionDAGChecker* /*dagChecker*/) const
|
||||||
|
CM_OVERRIDE
|
||||||
{
|
{
|
||||||
return parameters.front();
|
return parameters.front();
|
||||||
}
|
}
|
||||||
@ -113,7 +115,8 @@ static const struct NotNode : public cmGeneratorExpressionNode
|
|||||||
std::string Evaluate(const std::vector<std::string>& parameters,
|
std::string Evaluate(const std::vector<std::string>& parameters,
|
||||||
cmGeneratorExpressionContext* context,
|
cmGeneratorExpressionContext* context,
|
||||||
const GeneratorExpressionContent* content,
|
const GeneratorExpressionContent* content,
|
||||||
cmGeneratorExpressionDAGChecker*) const CM_OVERRIDE
|
cmGeneratorExpressionDAGChecker* /*dagChecker*/) const
|
||||||
|
CM_OVERRIDE
|
||||||
{
|
{
|
||||||
if (*parameters.begin() != "0" && *parameters.begin() != "1") {
|
if (*parameters.begin() != "0" && *parameters.begin() != "1") {
|
||||||
reportError(
|
reportError(
|
||||||
@ -132,9 +135,10 @@ static const struct BoolNode : public cmGeneratorExpressionNode
|
|||||||
int NumExpectedParameters() const CM_OVERRIDE { return 1; }
|
int NumExpectedParameters() const CM_OVERRIDE { return 1; }
|
||||||
|
|
||||||
std::string Evaluate(const std::vector<std::string>& parameters,
|
std::string Evaluate(const std::vector<std::string>& parameters,
|
||||||
cmGeneratorExpressionContext*,
|
cmGeneratorExpressionContext* /*context*/,
|
||||||
const GeneratorExpressionContent*,
|
const GeneratorExpressionContent* /*content*/,
|
||||||
cmGeneratorExpressionDAGChecker*) const CM_OVERRIDE
|
cmGeneratorExpressionDAGChecker* /*dagChecker*/) const
|
||||||
|
CM_OVERRIDE
|
||||||
{
|
{
|
||||||
return !cmSystemTools::IsOff(parameters.begin()->c_str()) ? "1" : "0";
|
return !cmSystemTools::IsOff(parameters.begin()->c_str()) ? "1" : "0";
|
||||||
}
|
}
|
||||||
@ -147,9 +151,10 @@ static const struct StrEqualNode : public cmGeneratorExpressionNode
|
|||||||
int NumExpectedParameters() const CM_OVERRIDE { return 2; }
|
int NumExpectedParameters() const CM_OVERRIDE { return 2; }
|
||||||
|
|
||||||
std::string Evaluate(const std::vector<std::string>& parameters,
|
std::string Evaluate(const std::vector<std::string>& parameters,
|
||||||
cmGeneratorExpressionContext*,
|
cmGeneratorExpressionContext* /*context*/,
|
||||||
const GeneratorExpressionContent*,
|
const GeneratorExpressionContent* /*content*/,
|
||||||
cmGeneratorExpressionDAGChecker*) const CM_OVERRIDE
|
cmGeneratorExpressionDAGChecker* /*dagChecker*/) const
|
||||||
|
CM_OVERRIDE
|
||||||
{
|
{
|
||||||
return *parameters.begin() == parameters[1] ? "1" : "0";
|
return *parameters.begin() == parameters[1] ? "1" : "0";
|
||||||
}
|
}
|
||||||
@ -164,7 +169,8 @@ static const struct EqualNode : public cmGeneratorExpressionNode
|
|||||||
std::string Evaluate(const std::vector<std::string>& parameters,
|
std::string Evaluate(const std::vector<std::string>& parameters,
|
||||||
cmGeneratorExpressionContext* context,
|
cmGeneratorExpressionContext* context,
|
||||||
const GeneratorExpressionContent* content,
|
const GeneratorExpressionContent* content,
|
||||||
cmGeneratorExpressionDAGChecker*) const CM_OVERRIDE
|
cmGeneratorExpressionDAGChecker* /*dagChecker*/) const
|
||||||
|
CM_OVERRIDE
|
||||||
{
|
{
|
||||||
char* pEnd;
|
char* pEnd;
|
||||||
|
|
||||||
@ -239,9 +245,10 @@ static const struct LowerCaseNode : public cmGeneratorExpressionNode
|
|||||||
bool AcceptsArbitraryContentParameter() const CM_OVERRIDE { return true; }
|
bool AcceptsArbitraryContentParameter() const CM_OVERRIDE { return true; }
|
||||||
|
|
||||||
std::string Evaluate(const std::vector<std::string>& parameters,
|
std::string Evaluate(const std::vector<std::string>& parameters,
|
||||||
cmGeneratorExpressionContext*,
|
cmGeneratorExpressionContext* /*context*/,
|
||||||
const GeneratorExpressionContent*,
|
const GeneratorExpressionContent* /*content*/,
|
||||||
cmGeneratorExpressionDAGChecker*) const CM_OVERRIDE
|
cmGeneratorExpressionDAGChecker* /*dagChecker*/) const
|
||||||
|
CM_OVERRIDE
|
||||||
{
|
{
|
||||||
return cmSystemTools::LowerCase(parameters.front());
|
return cmSystemTools::LowerCase(parameters.front());
|
||||||
}
|
}
|
||||||
@ -254,9 +261,10 @@ static const struct UpperCaseNode : public cmGeneratorExpressionNode
|
|||||||
bool AcceptsArbitraryContentParameter() const CM_OVERRIDE { return true; }
|
bool AcceptsArbitraryContentParameter() const CM_OVERRIDE { return true; }
|
||||||
|
|
||||||
std::string Evaluate(const std::vector<std::string>& parameters,
|
std::string Evaluate(const std::vector<std::string>& parameters,
|
||||||
cmGeneratorExpressionContext*,
|
cmGeneratorExpressionContext* /*context*/,
|
||||||
const GeneratorExpressionContent*,
|
const GeneratorExpressionContent* /*content*/,
|
||||||
cmGeneratorExpressionDAGChecker*) const CM_OVERRIDE
|
cmGeneratorExpressionDAGChecker* /*dagChecker*/) const
|
||||||
|
CM_OVERRIDE
|
||||||
{
|
{
|
||||||
return cmSystemTools::UpperCase(parameters.front());
|
return cmSystemTools::UpperCase(parameters.front());
|
||||||
}
|
}
|
||||||
@ -269,9 +277,10 @@ static const struct MakeCIdentifierNode : public cmGeneratorExpressionNode
|
|||||||
bool AcceptsArbitraryContentParameter() const CM_OVERRIDE { return true; }
|
bool AcceptsArbitraryContentParameter() const CM_OVERRIDE { return true; }
|
||||||
|
|
||||||
std::string Evaluate(const std::vector<std::string>& parameters,
|
std::string Evaluate(const std::vector<std::string>& parameters,
|
||||||
cmGeneratorExpressionContext*,
|
cmGeneratorExpressionContext* /*context*/,
|
||||||
const GeneratorExpressionContent*,
|
const GeneratorExpressionContent* /*content*/,
|
||||||
cmGeneratorExpressionDAGChecker*) const CM_OVERRIDE
|
cmGeneratorExpressionDAGChecker* /*dagChecker*/) const
|
||||||
|
CM_OVERRIDE
|
||||||
{
|
{
|
||||||
return cmSystemTools::MakeCidentifier(parameters.front());
|
return cmSystemTools::MakeCidentifier(parameters.front());
|
||||||
}
|
}
|
||||||
@ -283,10 +292,11 @@ static const struct Angle_RNode : public cmGeneratorExpressionNode
|
|||||||
|
|
||||||
int NumExpectedParameters() const CM_OVERRIDE { return 0; }
|
int NumExpectedParameters() const CM_OVERRIDE { return 0; }
|
||||||
|
|
||||||
std::string Evaluate(const std::vector<std::string>&,
|
std::string Evaluate(const std::vector<std::string>& /*parameters*/,
|
||||||
cmGeneratorExpressionContext*,
|
cmGeneratorExpressionContext* /*context*/,
|
||||||
const GeneratorExpressionContent*,
|
const GeneratorExpressionContent* /*content*/,
|
||||||
cmGeneratorExpressionDAGChecker*) const CM_OVERRIDE
|
cmGeneratorExpressionDAGChecker* /*dagChecker*/) const
|
||||||
|
CM_OVERRIDE
|
||||||
{
|
{
|
||||||
return ">";
|
return ">";
|
||||||
}
|
}
|
||||||
@ -298,10 +308,11 @@ static const struct CommaNode : public cmGeneratorExpressionNode
|
|||||||
|
|
||||||
int NumExpectedParameters() const CM_OVERRIDE { return 0; }
|
int NumExpectedParameters() const CM_OVERRIDE { return 0; }
|
||||||
|
|
||||||
std::string Evaluate(const std::vector<std::string>&,
|
std::string Evaluate(const std::vector<std::string>& /*parameters*/,
|
||||||
cmGeneratorExpressionContext*,
|
cmGeneratorExpressionContext* /*context*/,
|
||||||
const GeneratorExpressionContent*,
|
const GeneratorExpressionContent* /*content*/,
|
||||||
cmGeneratorExpressionDAGChecker*) const CM_OVERRIDE
|
cmGeneratorExpressionDAGChecker* /*dagChecker*/) const
|
||||||
|
CM_OVERRIDE
|
||||||
{
|
{
|
||||||
return ",";
|
return ",";
|
||||||
}
|
}
|
||||||
@ -313,10 +324,11 @@ static const struct SemicolonNode : public cmGeneratorExpressionNode
|
|||||||
|
|
||||||
int NumExpectedParameters() const CM_OVERRIDE { return 0; }
|
int NumExpectedParameters() const CM_OVERRIDE { return 0; }
|
||||||
|
|
||||||
std::string Evaluate(const std::vector<std::string>&,
|
std::string Evaluate(const std::vector<std::string>& /*parameters*/,
|
||||||
cmGeneratorExpressionContext*,
|
cmGeneratorExpressionContext* /*context*/,
|
||||||
const GeneratorExpressionContent*,
|
const GeneratorExpressionContent* /*content*/,
|
||||||
cmGeneratorExpressionDAGChecker*) const CM_OVERRIDE
|
cmGeneratorExpressionDAGChecker* /*dagChecker*/) const
|
||||||
|
CM_OVERRIDE
|
||||||
{
|
{
|
||||||
return ";";
|
return ";";
|
||||||
}
|
}
|
||||||
@ -331,7 +343,7 @@ struct CompilerIdNode : public cmGeneratorExpressionNode
|
|||||||
std::string EvaluateWithLanguage(const std::vector<std::string>& parameters,
|
std::string EvaluateWithLanguage(const std::vector<std::string>& parameters,
|
||||||
cmGeneratorExpressionContext* context,
|
cmGeneratorExpressionContext* context,
|
||||||
const GeneratorExpressionContent* content,
|
const GeneratorExpressionContent* content,
|
||||||
cmGeneratorExpressionDAGChecker*,
|
cmGeneratorExpressionDAGChecker* /*unused*/,
|
||||||
const std::string& lang) const
|
const std::string& lang) const
|
||||||
{
|
{
|
||||||
const char* compilerId = context->LG->GetMakefile()->GetSafeDefinition(
|
const char* compilerId = context->LG->GetMakefile()->GetSafeDefinition(
|
||||||
@ -426,7 +438,7 @@ struct CompilerVersionNode : public cmGeneratorExpressionNode
|
|||||||
std::string EvaluateWithLanguage(const std::vector<std::string>& parameters,
|
std::string EvaluateWithLanguage(const std::vector<std::string>& parameters,
|
||||||
cmGeneratorExpressionContext* context,
|
cmGeneratorExpressionContext* context,
|
||||||
const GeneratorExpressionContent* content,
|
const GeneratorExpressionContent* content,
|
||||||
cmGeneratorExpressionDAGChecker*,
|
cmGeneratorExpressionDAGChecker* /*unused*/,
|
||||||
const std::string& lang) const
|
const std::string& lang) const
|
||||||
{
|
{
|
||||||
const char* compilerVersion =
|
const char* compilerVersion =
|
||||||
@ -506,8 +518,9 @@ struct PlatformIdNode : public cmGeneratorExpressionNode
|
|||||||
|
|
||||||
std::string Evaluate(const std::vector<std::string>& parameters,
|
std::string Evaluate(const std::vector<std::string>& parameters,
|
||||||
cmGeneratorExpressionContext* context,
|
cmGeneratorExpressionContext* context,
|
||||||
const GeneratorExpressionContent*,
|
const GeneratorExpressionContent* /*content*/,
|
||||||
cmGeneratorExpressionDAGChecker*) const CM_OVERRIDE
|
cmGeneratorExpressionDAGChecker* /*dagChecker*/) const
|
||||||
|
CM_OVERRIDE
|
||||||
{
|
{
|
||||||
const char* platformId =
|
const char* platformId =
|
||||||
context->LG->GetMakefile()->GetSafeDefinition("CMAKE_SYSTEM_NAME");
|
context->LG->GetMakefile()->GetSafeDefinition("CMAKE_SYSTEM_NAME");
|
||||||
@ -533,9 +546,10 @@ static const struct VersionGreaterNode : public cmGeneratorExpressionNode
|
|||||||
int NumExpectedParameters() const CM_OVERRIDE { return 2; }
|
int NumExpectedParameters() const CM_OVERRIDE { return 2; }
|
||||||
|
|
||||||
std::string Evaluate(const std::vector<std::string>& parameters,
|
std::string Evaluate(const std::vector<std::string>& parameters,
|
||||||
cmGeneratorExpressionContext*,
|
cmGeneratorExpressionContext* /*context*/,
|
||||||
const GeneratorExpressionContent*,
|
const GeneratorExpressionContent* /*content*/,
|
||||||
cmGeneratorExpressionDAGChecker*) const CM_OVERRIDE
|
cmGeneratorExpressionDAGChecker* /*dagChecker*/) const
|
||||||
|
CM_OVERRIDE
|
||||||
{
|
{
|
||||||
return cmSystemTools::VersionCompare(cmSystemTools::OP_GREATER,
|
return cmSystemTools::VersionCompare(cmSystemTools::OP_GREATER,
|
||||||
parameters.front().c_str(),
|
parameters.front().c_str(),
|
||||||
@ -552,9 +566,10 @@ static const struct VersionGreaterEqNode : public cmGeneratorExpressionNode
|
|||||||
int NumExpectedParameters() const CM_OVERRIDE { return 2; }
|
int NumExpectedParameters() const CM_OVERRIDE { return 2; }
|
||||||
|
|
||||||
std::string Evaluate(const std::vector<std::string>& parameters,
|
std::string Evaluate(const std::vector<std::string>& parameters,
|
||||||
cmGeneratorExpressionContext*,
|
cmGeneratorExpressionContext* /*context*/,
|
||||||
const GeneratorExpressionContent*,
|
const GeneratorExpressionContent* /*content*/,
|
||||||
cmGeneratorExpressionDAGChecker*) const CM_OVERRIDE
|
cmGeneratorExpressionDAGChecker* /*dagChecker*/) const
|
||||||
|
CM_OVERRIDE
|
||||||
{
|
{
|
||||||
return cmSystemTools::VersionCompare(cmSystemTools::OP_GREATER_EQUAL,
|
return cmSystemTools::VersionCompare(cmSystemTools::OP_GREATER_EQUAL,
|
||||||
parameters.front().c_str(),
|
parameters.front().c_str(),
|
||||||
@ -571,9 +586,10 @@ static const struct VersionLessNode : public cmGeneratorExpressionNode
|
|||||||
int NumExpectedParameters() const CM_OVERRIDE { return 2; }
|
int NumExpectedParameters() const CM_OVERRIDE { return 2; }
|
||||||
|
|
||||||
std::string Evaluate(const std::vector<std::string>& parameters,
|
std::string Evaluate(const std::vector<std::string>& parameters,
|
||||||
cmGeneratorExpressionContext*,
|
cmGeneratorExpressionContext* /*context*/,
|
||||||
const GeneratorExpressionContent*,
|
const GeneratorExpressionContent* /*content*/,
|
||||||
cmGeneratorExpressionDAGChecker*) const CM_OVERRIDE
|
cmGeneratorExpressionDAGChecker* /*dagChecker*/) const
|
||||||
|
CM_OVERRIDE
|
||||||
{
|
{
|
||||||
return cmSystemTools::VersionCompare(cmSystemTools::OP_LESS,
|
return cmSystemTools::VersionCompare(cmSystemTools::OP_LESS,
|
||||||
parameters.front().c_str(),
|
parameters.front().c_str(),
|
||||||
@ -590,9 +606,10 @@ static const struct VersionLessEqNode : public cmGeneratorExpressionNode
|
|||||||
int NumExpectedParameters() const CM_OVERRIDE { return 2; }
|
int NumExpectedParameters() const CM_OVERRIDE { return 2; }
|
||||||
|
|
||||||
std::string Evaluate(const std::vector<std::string>& parameters,
|
std::string Evaluate(const std::vector<std::string>& parameters,
|
||||||
cmGeneratorExpressionContext*,
|
cmGeneratorExpressionContext* /*context*/,
|
||||||
const GeneratorExpressionContent*,
|
const GeneratorExpressionContent* /*content*/,
|
||||||
cmGeneratorExpressionDAGChecker*) const CM_OVERRIDE
|
cmGeneratorExpressionDAGChecker* /*dagChecker*/) const
|
||||||
|
CM_OVERRIDE
|
||||||
{
|
{
|
||||||
return cmSystemTools::VersionCompare(cmSystemTools::OP_LESS_EQUAL,
|
return cmSystemTools::VersionCompare(cmSystemTools::OP_LESS_EQUAL,
|
||||||
parameters.front().c_str(),
|
parameters.front().c_str(),
|
||||||
@ -609,9 +626,10 @@ static const struct VersionEqualNode : public cmGeneratorExpressionNode
|
|||||||
int NumExpectedParameters() const CM_OVERRIDE { return 2; }
|
int NumExpectedParameters() const CM_OVERRIDE { return 2; }
|
||||||
|
|
||||||
std::string Evaluate(const std::vector<std::string>& parameters,
|
std::string Evaluate(const std::vector<std::string>& parameters,
|
||||||
cmGeneratorExpressionContext*,
|
cmGeneratorExpressionContext* /*context*/,
|
||||||
const GeneratorExpressionContent*,
|
const GeneratorExpressionContent* /*content*/,
|
||||||
cmGeneratorExpressionDAGChecker*) const CM_OVERRIDE
|
cmGeneratorExpressionDAGChecker* /*dagChecker*/) const
|
||||||
|
CM_OVERRIDE
|
||||||
{
|
{
|
||||||
return cmSystemTools::VersionCompare(cmSystemTools::OP_EQUAL,
|
return cmSystemTools::VersionCompare(cmSystemTools::OP_EQUAL,
|
||||||
parameters.front().c_str(),
|
parameters.front().c_str(),
|
||||||
@ -625,10 +643,11 @@ static const struct LinkOnlyNode : public cmGeneratorExpressionNode
|
|||||||
{
|
{
|
||||||
LinkOnlyNode() {}
|
LinkOnlyNode() {}
|
||||||
|
|
||||||
std::string Evaluate(
|
std::string Evaluate(const std::vector<std::string>& parameters,
|
||||||
const std::vector<std::string>& parameters, cmGeneratorExpressionContext*,
|
cmGeneratorExpressionContext* /*context*/,
|
||||||
const GeneratorExpressionContent*,
|
const GeneratorExpressionContent* /*content*/,
|
||||||
cmGeneratorExpressionDAGChecker* dagChecker) const CM_OVERRIDE
|
cmGeneratorExpressionDAGChecker* dagChecker) const
|
||||||
|
CM_OVERRIDE
|
||||||
{
|
{
|
||||||
if (!dagChecker->GetTransitivePropertiesOnly()) {
|
if (!dagChecker->GetTransitivePropertiesOnly()) {
|
||||||
return parameters.front();
|
return parameters.front();
|
||||||
@ -643,10 +662,11 @@ static const struct ConfigurationNode : public cmGeneratorExpressionNode
|
|||||||
|
|
||||||
int NumExpectedParameters() const CM_OVERRIDE { return 0; }
|
int NumExpectedParameters() const CM_OVERRIDE { return 0; }
|
||||||
|
|
||||||
std::string Evaluate(const std::vector<std::string>&,
|
std::string Evaluate(const std::vector<std::string>& /*parameters*/,
|
||||||
cmGeneratorExpressionContext* context,
|
cmGeneratorExpressionContext* context,
|
||||||
const GeneratorExpressionContent*,
|
const GeneratorExpressionContent* /*content*/,
|
||||||
cmGeneratorExpressionDAGChecker*) const CM_OVERRIDE
|
cmGeneratorExpressionDAGChecker* /*dagChecker*/) const
|
||||||
|
CM_OVERRIDE
|
||||||
{
|
{
|
||||||
context->HadContextSensitiveCondition = true;
|
context->HadContextSensitiveCondition = true;
|
||||||
return context->Config;
|
return context->Config;
|
||||||
@ -662,7 +682,8 @@ static const struct ConfigurationTestNode : public cmGeneratorExpressionNode
|
|||||||
std::string Evaluate(const std::vector<std::string>& parameters,
|
std::string Evaluate(const std::vector<std::string>& parameters,
|
||||||
cmGeneratorExpressionContext* context,
|
cmGeneratorExpressionContext* context,
|
||||||
const GeneratorExpressionContent* content,
|
const GeneratorExpressionContent* content,
|
||||||
cmGeneratorExpressionDAGChecker*) const CM_OVERRIDE
|
cmGeneratorExpressionDAGChecker* /*dagChecker*/) const
|
||||||
|
CM_OVERRIDE
|
||||||
{
|
{
|
||||||
if (parameters.empty()) {
|
if (parameters.empty()) {
|
||||||
return configurationNode.Evaluate(parameters, context, content,
|
return configurationNode.Evaluate(parameters, context, content,
|
||||||
@ -721,9 +742,10 @@ static const struct JoinNode : public cmGeneratorExpressionNode
|
|||||||
bool AcceptsArbitraryContentParameter() const CM_OVERRIDE { return true; }
|
bool AcceptsArbitraryContentParameter() const CM_OVERRIDE { return true; }
|
||||||
|
|
||||||
std::string Evaluate(const std::vector<std::string>& parameters,
|
std::string Evaluate(const std::vector<std::string>& parameters,
|
||||||
cmGeneratorExpressionContext*,
|
cmGeneratorExpressionContext* /*context*/,
|
||||||
const GeneratorExpressionContent*,
|
const GeneratorExpressionContent* /*content*/,
|
||||||
cmGeneratorExpressionDAGChecker*) const CM_OVERRIDE
|
cmGeneratorExpressionDAGChecker* /*dagChecker*/) const
|
||||||
|
CM_OVERRIDE
|
||||||
{
|
{
|
||||||
std::vector<std::string> list;
|
std::vector<std::string> list;
|
||||||
cmSystemTools::ExpandListArgument(parameters.front(), list);
|
cmSystemTools::ExpandListArgument(parameters.front(), list);
|
||||||
@ -1138,9 +1160,10 @@ static const struct TargetNameNode : public cmGeneratorExpressionNode
|
|||||||
bool RequiresLiteralInput() const CM_OVERRIDE { return true; }
|
bool RequiresLiteralInput() const CM_OVERRIDE { return true; }
|
||||||
|
|
||||||
std::string Evaluate(const std::vector<std::string>& parameters,
|
std::string Evaluate(const std::vector<std::string>& parameters,
|
||||||
cmGeneratorExpressionContext*,
|
cmGeneratorExpressionContext* /*context*/,
|
||||||
const GeneratorExpressionContent*,
|
const GeneratorExpressionContent* /*content*/,
|
||||||
cmGeneratorExpressionDAGChecker*) const CM_OVERRIDE
|
cmGeneratorExpressionDAGChecker* /*dagChecker*/) const
|
||||||
|
CM_OVERRIDE
|
||||||
{
|
{
|
||||||
return parameters.front();
|
return parameters.front();
|
||||||
}
|
}
|
||||||
@ -1156,7 +1179,8 @@ static const struct TargetObjectsNode : public cmGeneratorExpressionNode
|
|||||||
std::string Evaluate(const std::vector<std::string>& parameters,
|
std::string Evaluate(const std::vector<std::string>& parameters,
|
||||||
cmGeneratorExpressionContext* context,
|
cmGeneratorExpressionContext* context,
|
||||||
const GeneratorExpressionContent* content,
|
const GeneratorExpressionContent* content,
|
||||||
cmGeneratorExpressionDAGChecker*) const CM_OVERRIDE
|
cmGeneratorExpressionDAGChecker* /*dagChecker*/) const
|
||||||
|
CM_OVERRIDE
|
||||||
{
|
{
|
||||||
if (!context->EvaluateForBuildsystem) {
|
if (!context->EvaluateForBuildsystem) {
|
||||||
std::ostringstream e;
|
std::ostringstream e;
|
||||||
@ -1357,7 +1381,8 @@ static const struct TargetPolicyNode : public cmGeneratorExpressionNode
|
|||||||
std::string Evaluate(const std::vector<std::string>& parameters,
|
std::string Evaluate(const std::vector<std::string>& parameters,
|
||||||
cmGeneratorExpressionContext* context,
|
cmGeneratorExpressionContext* context,
|
||||||
const GeneratorExpressionContent* content,
|
const GeneratorExpressionContent* content,
|
||||||
cmGeneratorExpressionDAGChecker*) const CM_OVERRIDE
|
cmGeneratorExpressionDAGChecker* /*dagChecker*/) const
|
||||||
|
CM_OVERRIDE
|
||||||
{
|
{
|
||||||
if (!context->HeadTarget) {
|
if (!context->HeadTarget) {
|
||||||
reportError(
|
reportError(
|
||||||
@ -1414,10 +1439,11 @@ static const struct InstallPrefixNode : public cmGeneratorExpressionNode
|
|||||||
bool GeneratesContent() const CM_OVERRIDE { return true; }
|
bool GeneratesContent() const CM_OVERRIDE { return true; }
|
||||||
int NumExpectedParameters() const CM_OVERRIDE { return 0; }
|
int NumExpectedParameters() const CM_OVERRIDE { return 0; }
|
||||||
|
|
||||||
std::string Evaluate(const std::vector<std::string>&,
|
std::string Evaluate(const std::vector<std::string>& /*parameters*/,
|
||||||
cmGeneratorExpressionContext* context,
|
cmGeneratorExpressionContext* context,
|
||||||
const GeneratorExpressionContent* content,
|
const GeneratorExpressionContent* content,
|
||||||
cmGeneratorExpressionDAGChecker*) const CM_OVERRIDE
|
cmGeneratorExpressionDAGChecker* /*dagChecker*/) const
|
||||||
|
CM_OVERRIDE
|
||||||
{
|
{
|
||||||
reportError(context, content->GetOriginalExpression(),
|
reportError(context, content->GetOriginalExpression(),
|
||||||
"INSTALL_PREFIX is a marker for install(EXPORT) only. It "
|
"INSTALL_PREFIX is a marker for install(EXPORT) only. It "
|
||||||
@ -1534,7 +1560,7 @@ struct TargetFilesystemArtifactResultCreator<ArtifactNameTag>
|
|||||||
{
|
{
|
||||||
static std::string Create(cmGeneratorTarget* target,
|
static std::string Create(cmGeneratorTarget* target,
|
||||||
cmGeneratorExpressionContext* context,
|
cmGeneratorExpressionContext* context,
|
||||||
const GeneratorExpressionContent*)
|
const GeneratorExpressionContent* /*unused*/)
|
||||||
{
|
{
|
||||||
return target->GetFullPath(context->Config, false, true);
|
return target->GetFullPath(context->Config, false, true);
|
||||||
}
|
}
|
||||||
@ -1653,7 +1679,8 @@ static const struct ShellPathNode : public cmGeneratorExpressionNode
|
|||||||
std::string Evaluate(const std::vector<std::string>& parameters,
|
std::string Evaluate(const std::vector<std::string>& parameters,
|
||||||
cmGeneratorExpressionContext* context,
|
cmGeneratorExpressionContext* context,
|
||||||
const GeneratorExpressionContent* content,
|
const GeneratorExpressionContent* content,
|
||||||
cmGeneratorExpressionDAGChecker*) const CM_OVERRIDE
|
cmGeneratorExpressionDAGChecker* /*dagChecker*/) const
|
||||||
|
CM_OVERRIDE
|
||||||
{
|
{
|
||||||
if (!cmSystemTools::FileIsFullPath(parameters.front())) {
|
if (!cmSystemTools::FileIsFullPath(parameters.front())) {
|
||||||
reportError(context, content->GetOriginalExpression(),
|
reportError(context, content->GetOriginalExpression(),
|
||||||
|
@ -128,7 +128,7 @@ template <bool>
|
|||||||
struct DoAccept
|
struct DoAccept
|
||||||
{
|
{
|
||||||
template <typename T>
|
template <typename T>
|
||||||
static void Do(T&, cmSourceFile*)
|
static void Do(T& /*unused*/, cmSourceFile* /*unused*/)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -3271,7 +3271,8 @@ template <>
|
|||||||
bool getLinkInterfaceDependentProperty(cmGeneratorTarget const* tgt,
|
bool getLinkInterfaceDependentProperty(cmGeneratorTarget const* tgt,
|
||||||
const std::string& prop,
|
const std::string& prop,
|
||||||
const std::string& config,
|
const std::string& config,
|
||||||
CompatibleType, bool*)
|
CompatibleType /*unused*/,
|
||||||
|
bool* /*unused*/)
|
||||||
{
|
{
|
||||||
return tgt->GetLinkInterfaceDependentBoolProperty(prop, config);
|
return tgt->GetLinkInterfaceDependentBoolProperty(prop, config);
|
||||||
}
|
}
|
||||||
@ -3280,7 +3281,8 @@ template <>
|
|||||||
const char* getLinkInterfaceDependentProperty(cmGeneratorTarget const* tgt,
|
const char* getLinkInterfaceDependentProperty(cmGeneratorTarget const* tgt,
|
||||||
const std::string& prop,
|
const std::string& prop,
|
||||||
const std::string& config,
|
const std::string& config,
|
||||||
CompatibleType t, const char**)
|
CompatibleType t,
|
||||||
|
const char** /*unused*/)
|
||||||
{
|
{
|
||||||
switch (t) {
|
switch (t) {
|
||||||
case BoolType:
|
case BoolType:
|
||||||
@ -3303,7 +3305,7 @@ void checkPropertyConsistency(cmGeneratorTarget const* depender,
|
|||||||
const std::string& propName,
|
const std::string& propName,
|
||||||
std::set<std::string>& emitted,
|
std::set<std::string>& emitted,
|
||||||
const std::string& config, CompatibleType t,
|
const std::string& config, CompatibleType t,
|
||||||
PropertyType*)
|
PropertyType* /*unused*/)
|
||||||
{
|
{
|
||||||
const char* prop = dependee->GetProperty(propName);
|
const char* prop = dependee->GetProperty(propName);
|
||||||
if (!prop) {
|
if (!prop) {
|
||||||
@ -3536,12 +3538,12 @@ std::string valueAsString<const char*>(const char* value)
|
|||||||
template <typename PropertyType>
|
template <typename PropertyType>
|
||||||
PropertyType impliedValue(PropertyType);
|
PropertyType impliedValue(PropertyType);
|
||||||
template <>
|
template <>
|
||||||
bool impliedValue<bool>(bool)
|
bool impliedValue<bool>(bool /*unused*/)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
template <>
|
template <>
|
||||||
const char* impliedValue<const char*>(const char*)
|
const char* impliedValue<const char*>(const char* /*unused*/)
|
||||||
{
|
{
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
@ -3552,7 +3554,8 @@ std::pair<bool, PropertyType> consistentProperty(PropertyType lhs,
|
|||||||
CompatibleType t);
|
CompatibleType t);
|
||||||
|
|
||||||
template <>
|
template <>
|
||||||
std::pair<bool, bool> consistentProperty(bool lhs, bool rhs, CompatibleType)
|
std::pair<bool, bool> consistentProperty(bool lhs, bool rhs,
|
||||||
|
CompatibleType /*unused*/)
|
||||||
{
|
{
|
||||||
return std::make_pair(lhs == rhs, lhs);
|
return std::make_pair(lhs == rhs, lhs);
|
||||||
}
|
}
|
||||||
@ -3626,7 +3629,7 @@ PropertyType checkInterfacePropertyCompatibility(cmGeneratorTarget const* tgt,
|
|||||||
const std::string& config,
|
const std::string& config,
|
||||||
const char* defaultValue,
|
const char* defaultValue,
|
||||||
CompatibleType t,
|
CompatibleType t,
|
||||||
PropertyType*)
|
PropertyType* /*unused*/)
|
||||||
{
|
{
|
||||||
PropertyType propContent = getTypedProperty<PropertyType>(tgt, p);
|
PropertyType propContent = getTypedProperty<PropertyType>(tgt, p);
|
||||||
std::vector<std::string> headPropKeys = tgt->GetPropertyKeys();
|
std::vector<std::string> headPropKeys = tgt->GetPropertyKeys();
|
||||||
|
@ -1515,7 +1515,8 @@ void cmGlobalGenerator::ClearGeneratorMembers()
|
|||||||
this->BinaryDirectories.clear();
|
this->BinaryDirectories.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
void cmGlobalGenerator::ComputeTargetObjectDirectory(cmGeneratorTarget*) const
|
void cmGlobalGenerator::ComputeTargetObjectDirectory(
|
||||||
|
cmGeneratorTarget* /*unused*/) const
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1644,15 +1645,17 @@ int cmGlobalGenerator::TryCompile(const std::string& srcdir,
|
|||||||
}
|
}
|
||||||
|
|
||||||
void cmGlobalGenerator::GenerateBuildCommand(
|
void cmGlobalGenerator::GenerateBuildCommand(
|
||||||
std::vector<std::string>& makeCommand, const std::string&,
|
std::vector<std::string>& makeCommand, const std::string& /*unused*/,
|
||||||
const std::string&, const std::string&, const std::string&,
|
const std::string& /*unused*/, const std::string& /*unused*/,
|
||||||
const std::string&, bool, bool, std::vector<std::string> const&)
|
const std::string& /*unused*/, const std::string& /*unused*/,
|
||||||
|
bool /*unused*/, bool /*unused*/, std::vector<std::string> const& /*unused*/)
|
||||||
{
|
{
|
||||||
makeCommand.push_back(
|
makeCommand.push_back(
|
||||||
"cmGlobalGenerator::GenerateBuildCommand not implemented");
|
"cmGlobalGenerator::GenerateBuildCommand not implemented");
|
||||||
}
|
}
|
||||||
|
|
||||||
int cmGlobalGenerator::Build(const std::string&, const std::string& bindir,
|
int cmGlobalGenerator::Build(const std::string& /*unused*/,
|
||||||
|
const std::string& bindir,
|
||||||
const std::string& projectName,
|
const std::string& projectName,
|
||||||
const std::string& target, std::string& output,
|
const std::string& target, std::string& output,
|
||||||
const std::string& makeCommandCSTR,
|
const std::string& makeCommandCSTR,
|
||||||
@ -2372,10 +2375,10 @@ std::string cmGlobalGenerator::GetSharedLibFlagsForLanguage(
|
|||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
void cmGlobalGenerator::AppendDirectoryForConfig(const std::string&,
|
void cmGlobalGenerator::AppendDirectoryForConfig(const std::string& /*unused*/,
|
||||||
const std::string&,
|
const std::string& /*unused*/,
|
||||||
const std::string&,
|
const std::string& /*unused*/,
|
||||||
std::string&)
|
std::string& /*unused*/)
|
||||||
{
|
{
|
||||||
// Subclasses that support multiple configurations should implement
|
// Subclasses that support multiple configurations should implement
|
||||||
// this method to append the subdirectory for the given build
|
// this method to append the subdirectory for the given build
|
||||||
|
@ -1371,8 +1371,8 @@ void cmLocalGenerator::GetTargetDefines(cmGeneratorTarget const* target,
|
|||||||
this->AddCompileDefinitions(defines, target, config, lang.c_str());
|
this->AddCompileDefinitions(defines, target, config, lang.c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string cmLocalGenerator::GetTargetFortranFlags(cmGeneratorTarget const*,
|
std::string cmLocalGenerator::GetTargetFortranFlags(
|
||||||
std::string const&)
|
cmGeneratorTarget const* /*unused*/, std::string const& /*unused*/)
|
||||||
{
|
{
|
||||||
// Implemented by specific generators that override this.
|
// Implemented by specific generators that override this.
|
||||||
return std::string();
|
return std::string();
|
||||||
@ -2478,7 +2478,8 @@ std::string& cmLocalGenerator::CreateSafeUniqueObjectFileName(
|
|||||||
}
|
}
|
||||||
|
|
||||||
void cmLocalGenerator::ComputeObjectFilenames(
|
void cmLocalGenerator::ComputeObjectFilenames(
|
||||||
std::map<cmSourceFile const*, std::string>&, cmGeneratorTarget const*)
|
std::map<cmSourceFile const*, std::string>& /*unused*/,
|
||||||
|
cmGeneratorTarget const* /*unused*/)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2613,7 +2614,7 @@ const char* cmLocalGenerator::GetCurrentSourceDirectory() const
|
|||||||
}
|
}
|
||||||
|
|
||||||
std::string cmLocalGenerator::GetTargetDirectory(
|
std::string cmLocalGenerator::GetTargetDirectory(
|
||||||
const cmGeneratorTarget*) const
|
const cmGeneratorTarget* /*unused*/) const
|
||||||
{
|
{
|
||||||
cmSystemTools::Error("GetTargetDirectory"
|
cmSystemTools::Error("GetTargetDirectory"
|
||||||
" called on cmLocalGenerator");
|
" called on cmLocalGenerator");
|
||||||
|
@ -293,7 +293,8 @@ std::string cmPolicies::GetRequiredPolicyError(cmPolicies::PolicyID id)
|
|||||||
}
|
}
|
||||||
|
|
||||||
///! Get the default status for a policy
|
///! Get the default status for a policy
|
||||||
cmPolicies::PolicyStatus cmPolicies::GetPolicyStatus(cmPolicies::PolicyID)
|
cmPolicies::PolicyStatus cmPolicies::GetPolicyStatus(
|
||||||
|
cmPolicies::PolicyID /*unused*/)
|
||||||
{
|
{
|
||||||
return cmPolicies::WARN;
|
return cmPolicies::WARN;
|
||||||
}
|
}
|
||||||
|
@ -117,9 +117,9 @@ void cmScriptGenerator::GenerateScriptActions(std::ostream& os,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void cmScriptGenerator::GenerateScriptForConfig(std::ostream&,
|
void cmScriptGenerator::GenerateScriptForConfig(std::ostream& /*unused*/,
|
||||||
const std::string&,
|
const std::string& /*unused*/,
|
||||||
Indent const&)
|
Indent const& /*unused*/)
|
||||||
{
|
{
|
||||||
// No actions for this generator.
|
// No actions for this generator.
|
||||||
}
|
}
|
||||||
|
@ -191,7 +191,8 @@ void cmSystemTools::ExpandRegistryValues(std::string& source, KeyWOW64 view)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
void cmSystemTools::ExpandRegistryValues(std::string& source, KeyWOW64)
|
void cmSystemTools::ExpandRegistryValues(std::string& source,
|
||||||
|
KeyWOW64 /*unused*/)
|
||||||
{
|
{
|
||||||
cmsys::RegularExpression regEntry("\\[(HKEY[^]]*)\\]");
|
cmsys::RegularExpression regEntry("\\[(HKEY[^]]*)\\]");
|
||||||
while (regEntry.find(source)) {
|
while (regEntry.find(source)) {
|
||||||
|
@ -198,7 +198,7 @@ void cmXMLParser::ReportXmlParseError()
|
|||||||
XML_ErrorString(XML_GetErrorCode(parser)));
|
XML_ErrorString(XML_GetErrorCode(parser)));
|
||||||
}
|
}
|
||||||
|
|
||||||
void cmXMLParser::ReportError(int line, int, const char* msg)
|
void cmXMLParser::ReportError(int line, int /*unused*/, const char* msg)
|
||||||
{
|
{
|
||||||
if (this->ReportCallback) {
|
if (this->ReportCallback) {
|
||||||
this->ReportCallback(line, msg, this->ReportCallbackData);
|
this->ReportCallback(line, msg, this->ReportCallbackData);
|
||||||
|
@ -113,8 +113,9 @@
|
|||||||
static bool cmakeCheckStampFile(const char* stampName);
|
static bool cmakeCheckStampFile(const char* stampName);
|
||||||
static bool cmakeCheckStampList(const char* stampName);
|
static bool cmakeCheckStampList(const char* stampName);
|
||||||
|
|
||||||
void cmWarnUnusedCliWarning(const std::string& variable, int, void* ctx,
|
void cmWarnUnusedCliWarning(const std::string& variable, int /*unused*/,
|
||||||
const char*, const cmMakefile*)
|
void* ctx, const char* /*unused*/,
|
||||||
|
const cmMakefile* /*unused*/)
|
||||||
{
|
{
|
||||||
cmake* cm = reinterpret_cast<cmake*>(ctx);
|
cmake* cm = reinterpret_cast<cmake*>(ctx);
|
||||||
cm->MarkCliAsUsed(variable);
|
cm->MarkCliAsUsed(variable);
|
||||||
|
@ -124,8 +124,8 @@ static std::string cmakemainGetStack(void* clientdata)
|
|||||||
return msg;
|
return msg;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void cmakemainMessageCallback(const char* m, const char*, bool&,
|
static void cmakemainMessageCallback(const char* m, const char* /*unused*/,
|
||||||
void* clientdata)
|
bool& /*unused*/, void* clientdata)
|
||||||
{
|
{
|
||||||
std::cerr << m << cmakemainGetStack(clientdata) << std::endl << std::flush;
|
std::cerr << m << cmakemainGetStack(clientdata) << std::endl << std::flush;
|
||||||
}
|
}
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
std::cout << "FAILED: " << m1 << m2 << "\n"; \
|
std::cout << "FAILED: " << m1 << m2 << "\n"; \
|
||||||
failed = 1
|
failed = 1
|
||||||
|
|
||||||
int testGeneratedFileStream(int, char* [])
|
int testGeneratedFileStream(int /*unused*/, char* /*unused*/ [])
|
||||||
{
|
{
|
||||||
int failed = 0;
|
int failed = 0;
|
||||||
cmGeneratedFileStream gm;
|
cmGeneratedFileStream gm;
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
std::cout << "FAILED: " << m << "\n"; \
|
std::cout << "FAILED: " << m << "\n"; \
|
||||||
failed = 1
|
failed = 1
|
||||||
|
|
||||||
int testSystemTools(int, char* [])
|
int testSystemTools(int /*unused*/, char* /*unused*/ [])
|
||||||
{
|
{
|
||||||
int failed = 0;
|
int failed = 0;
|
||||||
// ----------------------------------------------------------------------
|
// ----------------------------------------------------------------------
|
||||||
|
@ -97,7 +97,7 @@ static bool decode_bad(test_utf8_char const s)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
int testUTF8(int, char* [])
|
int testUTF8(int /*unused*/, char* /*unused*/ [])
|
||||||
{
|
{
|
||||||
int result = 0;
|
int result = 0;
|
||||||
for (test_utf8_entry const* e = good_entry; e->n; ++e) {
|
for (test_utf8_entry const* e = good_entry; e->n; ++e) {
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
int testXMLParser(int, char* [])
|
int testXMLParser(int /*unused*/, char* /*unused*/ [])
|
||||||
{
|
{
|
||||||
// TODO: Derive from parser and check attributes.
|
// TODO: Derive from parser and check attributes.
|
||||||
cmXMLParser parser;
|
cmXMLParser parser;
|
||||||
|
@ -28,7 +28,7 @@ static test_pair const pairs[] = {
|
|||||||
{ 0, 0 }
|
{ 0, 0 }
|
||||||
};
|
};
|
||||||
|
|
||||||
int testXMLSafe(int, char* [])
|
int testXMLSafe(int /*unused*/, char* /*unused*/ [])
|
||||||
{
|
{
|
||||||
int result = 0;
|
int result = 0;
|
||||||
for (test_pair const* p = pairs; p->in; ++p) {
|
for (test_pair const* p = pairs; p->in; ++p) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user