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

ENH: Improved behavior when run with arguments from the command line.

This commit is contained in:
Brad King 2003-07-23 17:28:44 -04:00
parent fde552ea6e
commit 6849cbdfcb
2 changed files with 74 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
Source/MFCDialog/CMakeSetupDialog.cpp
View File

@ -1343,51 +1343,87 @@ void CMakeSetupDialog::OnDoubleclickedAdvancedValues()
} }
// Handle param or single dropped file. // Handle param or single dropped file.
// If the dropped file is a build directory or any file in a void CMakeSetupDialog::ChangeDirectoriesFromFile(const char* arg)
// build directory, set the source dir from the cache file,
// otherwise set the source and build dirs to this file (or dir).
void CMakeSetupDialog::ChangeDirectoriesFromFile(const char* buffer)
{ {
// Get the path to this file // Check if the argument refers to a CMakeCache.txt or
// CMakeLists.txt file.
std::string path = buffer; std::string listPath;
if (!cmSystemTools::FileIsDirectory(path.c_str())) std::string cachePath;
{ bool argIsFile = false;
path = cmSystemTools::GetFilenamePath(path); if(cmSystemTools::FileIsDirectory(arg))
}
else
{ {
std::string path = cmSystemTools::CollapseFullPath(arg);
cmSystemTools::ConvertToUnixSlashes(path); cmSystemTools::ConvertToUnixSlashes(path);
std::string cacheFile = path;
cacheFile += "/CMakeCache.txt";
std::string listFile = path;
listFile += "/CMakeLists.txt";
if(cmSystemTools::FileExists(cacheFile.c_str()))
{
cachePath = path;
}
if(cmSystemTools::FileExists(listFile.c_str()))
{
listPath = path;
}
} }
else if(cmSystemTools::FileExists(arg))
// Check if it's a build dir and grab the cache
std::string cache_file = path;
cache_file += "/CMakeCache.txt";
cmCacheManager *cachem = this->m_CMakeInstance->GetCacheManager();
cmCacheManager::CacheIterator it =
cachem->NewIterator();
if (cmSystemTools::FileExists(cache_file.c_str()) &&
cachem->LoadCache(path.c_str()) &&
it.Find("CMAKE_HOME_DIRECTORY"))
{ {
path = cmSystemTools::ConvertToOutputPath(path.c_str()); argIsFile = true;
this->m_WhereBuild = path.c_str(); std::string fullPath = cmSystemTools::CollapseFullPath(arg);
std::string name = cmSystemTools::GetFilenameName(fullPath.c_str());
path = cmSystemTools::ConvertToOutputPath(it.GetValue()); name = cmSystemTools::LowerCase(name);
this->m_WhereSource = path.c_str(); if(name == "cmakecache.txt")
{
cachePath = cmSystemTools::GetFilenamePath(fullPath.c_str());
}
else if(name == "cmakelists.txt")
{
listPath = cmSystemTools::GetFilenamePath(fullPath.c_str());
}
} }
else
// If there is a CMakeCache.txt file, use its settings.
if(cachePath.length() > 0)
{ {
path = cmSystemTools::ConvertToOutputPath(path.c_str()); cmCacheManager* cachem = m_CMakeInstance->GetCacheManager();
this->m_WhereSource = this->m_WhereBuild = path.c_str(); cmCacheManager::CacheIterator it = cachem->NewIterator();
if(cachem->LoadCache(cachePath.c_str()) && it.Find("CMAKE_HOME_DIRECTORY"))
{
std::string path = cmSystemTools::ConvertToOutputPath(cachePath.c_str());
m_WhereBuild = path.c_str();
path = cmSystemTools::ConvertToOutputPath(it.GetValue());
m_WhereSource = path.c_str();
return;
}
}
// If there is a CMakeLists.txt file, use it as the source tree.
if(listPath.length() > 0)
{
std::string path = cmSystemTools::ConvertToOutputPath(listPath.c_str());
m_WhereSource = path.c_str();
if(argIsFile)
{
// Source CMakeLists.txt file given. It was probably dropped
// onto the window or executable. Default to an in-source
// build.
m_WhereBuild = path.c_str();
}
else
{
// Source directory given on command line. Use current working
// directory as build tree.
std::string cwd = cmSystemTools::GetCurrentWorkingDirectory();
path = cmSystemTools::ConvertToOutputPath(cwd.c_str());
m_WhereBuild = path.c_str();
}
} }
} }
// The framework calls this member function when the user releases the // The framework calls this member function when the user releases the
// left mouse button over a window that has registered itself as the // left mouse button over a window that has registered itself as the
// recipient of dropped files. // recipient of dropped files.

5
Source/MFCDialog/CMakeSetupDialog.h
View File

@ -97,8 +97,9 @@ protected:
void FillCacheManagerFromCacheGUI(); void FillCacheManagerFromCacheGUI();
// Create a shortcut on the desktop with the current Source/Build dir. // Create a shortcut on the desktop with the current Source/Build dir.
int CreateShortcut(); int CreateShortcut();
// Handle param or single dropped file.
void ChangeDirectoriesFromFile(const char *file); // Set initial directories from a file path.
void ChangeDirectoriesFromFile(const char* arg);
HICON m_hIcon; HICON m_hIcon;
CString m_RegistryKey; CString m_RegistryKey;