kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove trailing slash from findpath command

This commit is contained in:
Bill Hoffman 2003-01-17 10:28:41 -05:00
parent 0510292b9e
commit 68d9a5d404
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmFindPathCommand.cxx
View File

@ -87,6 +87,10 @@ bool cmFindPathCommand::InitialPass(std::vector<std::string> const& argsIn)
if(cmSystemTools::FileExists(tryPath.c_str()))
{
path[k] = cmSystemTools::CollapseFullPath(path[k].c_str());
if(path[k].size() && path[k][path[k].size()-1] == '/')
{
path[k] = path[k].substr(0, path[k].size()-1);
}
m_Makefile->AddCacheDefinition(args[0].c_str(),
path[k].c_str(),
helpString.c_str(),

7
Tests/Complex/Executable/complex.cxx
View File

@ -42,9 +42,9 @@ void ForceStringUse()
// ======================================================================
void cmFailed(const char* Message, const char* m2= "")
void cmFailed(const char* Message, const char* m2= "", const char* m3 = "")
{
std::cout << "FAILED: " << Message << m2 << "\n";
std::cout << "FAILED: " << Message << m2 << m3 << "\n";
cm_failed++;
}
@ -774,10 +774,11 @@ int main()
#ifndef REGISTRY_TEST_PATH
cmFailed("the CONFIGURE_FILE command is broken, REGISTRY_TEST_PATH is not defined.");
#else
std::cout << "REGISTRY_TEST_PATH == " << REGISTRY_TEST_PATH << "\n";
if(stricmp(REGISTRY_TEST_PATH, BINARY_DIR "/registry_dir") != 0)
{
cmFailed("the 'read registry value' function or CONFIGURE_FILE command is broken. REGISTRY_TEST_PATH == ",
REGISTRY_TEST_PATH);
REGISTRY_TEST_PATH, " is not " BINARY_DIR "/registry_dir");
}
else
{

7
Tests/ComplexOneConfig/Executable/complex.cxx
View File

@ -42,9 +42,9 @@ void ForceStringUse()
// ======================================================================
void cmFailed(const char* Message, const char* m2= "")
void cmFailed(const char* Message, const char* m2= "", const char* m3 = "")
{
std::cout << "FAILED: " << Message << m2 << "\n";
std::cout << "FAILED: " << Message << m2 << m3 << "\n";
cm_failed++;
}
@ -774,10 +774,11 @@ int main()
#ifndef REGISTRY_TEST_PATH
cmFailed("the CONFIGURE_FILE command is broken, REGISTRY_TEST_PATH is not defined.");
#else
std::cout << "REGISTRY_TEST_PATH == " << REGISTRY_TEST_PATH << "\n";
if(stricmp(REGISTRY_TEST_PATH, BINARY_DIR "/registry_dir") != 0)
{
cmFailed("the 'read registry value' function or CONFIGURE_FILE command is broken. REGISTRY_TEST_PATH == ",
REGISTRY_TEST_PATH);
REGISTRY_TEST_PATH, " is not " BINARY_DIR "/registry_dir");
}
else
{

7
Tests/ComplexRelativePaths/Executable/complex.cxx
View File

@ -42,9 +42,9 @@ void ForceStringUse()
// ======================================================================
void cmFailed(const char* Message, const char* m2= "")
void cmFailed(const char* Message, const char* m2= "", const char* m3 = "")
{
std::cout << "FAILED: " << Message << m2 << "\n";
std::cout << "FAILED: " << Message << m2 << m3 << "\n";
cm_failed++;
}
@ -774,10 +774,11 @@ int main()
#ifndef REGISTRY_TEST_PATH
cmFailed("the CONFIGURE_FILE command is broken, REGISTRY_TEST_PATH is not defined.");
#else
std::cout << "REGISTRY_TEST_PATH == " << REGISTRY_TEST_PATH << "\n";
if(stricmp(REGISTRY_TEST_PATH, BINARY_DIR "/registry_dir") != 0)
{
cmFailed("the 'read registry value' function or CONFIGURE_FILE command is broken. REGISTRY_TEST_PATH == ",
REGISTRY_TEST_PATH);
REGISTRY_TEST_PATH, " is not " BINARY_DIR "/registry_dir");
}
else
{