[cmake-commits] hoffman committed cmFindBase.cxx 1.18 1.19
cmFindBase.h 1.8 1.9
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Dec 28 15:31:50 EST 2006
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv20836/Source
Modified Files:
cmFindBase.cxx cmFindBase.h
Log Message:
BUG: fix problem with path suffix and mac frameworks and find stuff, showed up in FindPythonLibs.cmake
Index: cmFindBase.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFindBase.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- cmFindBase.h 18 Jul 2006 19:21:25 -0000 1.8
+++ cmFindBase.h 28 Dec 2006 20:31:47 -0000 1.9
@@ -42,13 +42,15 @@
protected:
void PrintFindStuff();
void ExpandPaths(std::vector<std::string> userPaths);
+ // add to the SearchPaths
+ void AddPaths(std::vector<std::string>& paths);
void AddFrameWorkPaths();
void AddAppBundlePaths();
void AddEnvironmentVairables();
void AddCMakeVairables();
void AddSystemEnvironmentVairables();
void AddCMakeSystemVariables();
- void ExpandRegistryAndCleanPath();
+ void ExpandRegistryAndCleanPath(std::vector<std::string>& paths);
// see if the VariableName is already set in the cache,
// also copy the documentation from the cache to VariableDocumentation
// if it has documentation in the cache
Index: cmFindBase.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFindBase.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- cmFindBase.cxx 11 Nov 2006 19:06:38 -0000 1.18
+++ cmFindBase.cxx 28 Dec 2006 20:31:47 -0000 1.19
@@ -444,14 +444,13 @@
this->AddFrameWorkPaths();
}
}
+ std::vector<std::string> paths;
// add the paths specified in the FIND_* call
for(unsigned int i =0; i < userPaths.size(); ++i)
{
- this->SearchPaths.push_back(userPaths[i]);
+ paths.push_back(userPaths[i]);
}
-
- // clean things up
- this->ExpandRegistryAndCleanPath();
+ this->AddPaths(paths);
}
void cmFindBase::AddEnvironmentVairables()
@@ -459,16 +458,17 @@
std::string var = "CMAKE_";
var += this->CMakePathName;
var += "_PATH";
- cmSystemTools::GetPath(this->SearchPaths, var.c_str());
+ std::vector<std::string> paths;
+ cmSystemTools::GetPath(paths, var.c_str());
if(this->SearchAppBundleLast)
{
- cmSystemTools::GetPath(this->SearchPaths, "CMAKE_APPBUNDLE_PATH");
+ cmSystemTools::GetPath(paths, "CMAKE_APPBUNDLE_PATH");
}
if(this->SearchFrameworkLast)
{
- cmSystemTools::GetPath(this->SearchPaths, "CMAKE_FRAMEWORK_PATH");
+ cmSystemTools::GetPath(paths, "CMAKE_FRAMEWORK_PATH");
}
-
+ this->AddPaths(paths);
}
void cmFindBase::AddFrameWorkPaths()
@@ -477,10 +477,11 @@
{
return;
}
+ std::vector<std::string> paths;
// first environment variables
if(!this->NoCMakeEnvironmentPath)
{
- cmSystemTools::GetPath(this->SearchPaths, "CMAKE_FRAMEWORK_PATH");
+ cmSystemTools::GetPath(paths, "CMAKE_FRAMEWORK_PATH");
}
// add cmake variables
if(!this->NoCMakePath)
@@ -488,7 +489,7 @@
if(const char* path =
this->Makefile->GetDefinition("CMAKE_FRAMEWORK_PATH"))
{
- cmSystemTools::ExpandListArgument(path, this->SearchPaths);
+ cmSystemTools::ExpandListArgument(path, paths);
}
}
// AddCMakeSystemVariables
@@ -497,9 +498,20 @@
if(const char* path =
this->Makefile->GetDefinition("CMAKE_SYSTEM_FRAMEWORK_PATH"))
{
- cmSystemTools::ExpandListArgument(path, this->SearchPaths);
+ cmSystemTools::ExpandListArgument(path, paths);
}
}
+ this->AddPaths(paths);
+}
+
+void cmFindBase::AddPaths(std::vector<std::string> & paths)
+{
+ // add suffixes and clean up paths
+ this->ExpandRegistryAndCleanPath(paths);
+ // add the paths to the search paths
+ this->SearchPaths.insert(this->SearchPaths.end(),
+ paths.begin(),
+ paths.end());
}
void cmFindBase::AddAppBundlePaths()
@@ -508,10 +520,11 @@
{
return;
}
+ std::vector<std::string> paths;
// first environment variables
if(!this->NoCMakeEnvironmentPath)
{
- cmSystemTools::GetPath(this->SearchPaths, "CMAKE_APPBUNDLE_PATH");
+ cmSystemTools::GetPath(paths, "CMAKE_APPBUNDLE_PATH");
}
// add cmake variables
if(!this->NoCMakePath)
@@ -519,7 +532,7 @@
if(const char* path =
this->Makefile->GetDefinition("CMAKE_APPBUNDLE_PATH"))
{
- cmSystemTools::ExpandListArgument(path, this->SearchPaths);
+ cmSystemTools::ExpandListArgument(path, paths);
}
}
// AddCMakeSystemVariables
@@ -528,9 +541,10 @@
if(const char* path =
this->Makefile->GetDefinition("CMAKE_SYSTEM_APPBUNDLE_PATH"))
{
- cmSystemTools::ExpandListArgument(path, this->SearchPaths);
+ cmSystemTools::ExpandListArgument(path, paths);
}
}
+ this->AddPaths(paths);
}
void cmFindBase::AddCMakeVairables()
@@ -538,16 +552,17 @@
std::string var = "CMAKE_";
var += this->CMakePathName;
var += "_PATH";
+ std::vector<std::string> paths;
if(const char* path = this->Makefile->GetDefinition(var.c_str()))
{
- cmSystemTools::ExpandListArgument(path, this->SearchPaths);
+ cmSystemTools::ExpandListArgument(path, paths);
}
if(this->SearchAppBundleLast)
{
if(const char* path =
this->Makefile->GetDefinition("CMAKE_APPBUNDLE_PATH"))
{
- cmSystemTools::ExpandListArgument(path, this->SearchPaths);
+ cmSystemTools::ExpandListArgument(path, paths);
}
}
if(this->SearchFrameworkLast)
@@ -555,20 +570,23 @@
if(const char* path =
this->Makefile->GetDefinition("CMAKE_FRAMEWORK_PATH"))
{
- cmSystemTools::ExpandListArgument(path, this->SearchPaths);
+ cmSystemTools::ExpandListArgument(path, paths);
}
}
+ this->AddPaths(paths);
}
void cmFindBase::AddSystemEnvironmentVairables()
{
// Add LIB or INCLUDE
+ std::vector<std::string> paths;
if(this->EnvironmentPath.size())
{
- cmSystemTools::GetPath(this->SearchPaths, this->EnvironmentPath.c_str());
+ cmSystemTools::GetPath(paths, this->EnvironmentPath.c_str());
}
// Add PATH
- cmSystemTools::GetPath(this->SearchPaths);
+ cmSystemTools::GetPath(paths);
+ this->AddPaths(paths);
}
void cmFindBase::AddCMakeSystemVariables()
@@ -576,16 +594,17 @@
std::string var = "CMAKE_SYSTEM_";
var += this->CMakePathName;
var += "_PATH";
+ std::vector<std::string> paths;
if(const char* path = this->Makefile->GetDefinition(var.c_str()))
{
- cmSystemTools::ExpandListArgument(path, this->SearchPaths);
+ cmSystemTools::ExpandListArgument(path, paths);
}
if(this->SearchAppBundleLast)
{
if(const char* path =
this->Makefile->GetDefinition("CMAKE_SYSTEM_APPBUNDLE_PATH"))
{
- cmSystemTools::ExpandListArgument(path, this->SearchPaths);
+ cmSystemTools::ExpandListArgument(path, paths);
}
}
if(this->SearchFrameworkLast)
@@ -593,23 +612,28 @@
if(const char* path =
this->Makefile->GetDefinition("CMAKE_SYSTEM_FRAMEWORK_PATH"))
{
- cmSystemTools::ExpandListArgument(path, this->SearchPaths);
+ cmSystemTools::ExpandListArgument(path, paths);
}
}
+ this->AddPaths(paths);
}
-void cmFindBase::ExpandRegistryAndCleanPath()
+void cmFindBase::ExpandRegistryAndCleanPath(std::vector<std::string>& paths)
{
std::vector<std::string> finalPath;
std::vector<std::string>::iterator i;
- for(i = this->SearchPaths.begin();
- i != this->SearchPaths.end(); ++i)
+ // glob and expand registry stuff from paths and put
+ // into finalPath
+ for(i = paths.begin();
+ i != paths.end(); ++i)
{
cmSystemTools::ExpandRegistryValues(*i);
cmSystemTools::GlobDirs(i->c_str(), finalPath);
}
- this->SearchPaths.clear();
- // convert all paths to unix slashes
+ // clear the path
+ paths.clear();
+ // convert all paths to unix slashes and add search path suffixes
+ // if there are any
for(i = finalPath.begin();
i != finalPath.end(); ++i)
{
@@ -623,7 +647,7 @@
std::string p = *i + std::string("/") + *j;
// add to all paths because the search path may be modified
// later with lib being replaced for lib64 which may exist
- this->SearchPaths.push_back(p);
+ paths.push_back(p);
}
}
// now put the path without the path suffixes in the SearchPaths
@@ -632,7 +656,7 @@
{
// put all search paths in because it may later be replaced
// by lib64 stuff fixes bug 4009
- this->SearchPaths.push_back(*i);
+ paths.push_back(*i);
}
}
More information about the Cmake-commits
mailing list