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

ENH: better Drag&Drop, and change source dir automatically when build dir is changed in the GUI

Browse Source
This commit is contained in:
Sebastien Barre 2002-07-22 10:57:16 -04:00
parent e8dbdcaf0c
commit cdd688a75c
1 changed files with 50 additions and 15 deletions

61
Source/MFCDialog/CMakeSetupDialog.cpp

@ -608,6 +608,27 @@ void CMakeSetupDialog::OnChangeWhereSource()
// callback for changing the build directory // callback for changing the build directory
void CMakeSetupDialog::OnChangeWhereBuild() void CMakeSetupDialog::OnChangeWhereBuild()
{ {
// The build dir has changed, check if there is a cache, and
// grab the source dir from it
std::string path = this->m_WhereBuild;
cmSystemTools::ConvertToUnixSlashes(path);
std::string cache_file = path;
cache_file += "/CMakeCache.txt";
cmCacheManager *cache = cmCacheManager::GetInstance();
if (cmSystemTools::FileExists(cache_file.c_str()) &&
cache->LoadCache(path.c_str()) &&
cache->GetCacheEntry("CMAKE_HOME_DIRECTORY"))
{
path = cmSystemTools::ConvertToOutputPath(
cache->GetCacheEntry("CMAKE_HOME_DIRECTORY")->m_Value.c_str());
this->m_WhereSource = path.c_str();
this->m_WhereSourceControl.SetWindowText(this->m_WhereSource);
this->OnChangeWhereSource();
}
this->UpdateData(); this->UpdateData();
m_CacheEntriesList.RemoveAll(); m_CacheEntriesList.RemoveAll();
m_CacheEntriesList.ShowWindow(SW_SHOW); m_CacheEntriesList.ShowWindow(SW_SHOW);
@ -1169,33 +1190,47 @@ void CMakeSetupDialog::OnDoubleclickedAdvancedValues()
} }
// Handle param or single dropped file. // Handle param or single dropped file.
// If it's a directory, use it as source and build dirs // If the dropped file is a build directory or any file in a
// otherwise, if it's a CMakeCache, get source dir from cache // build directory, set the source dir from the cache file,
// otherwise use file's dir to set source and build dirs. // otherwise set the source and build dirs to this file (or dir).
void CMakeSetupDialog::ChangeDirectoriesFromFile(const char* buffer) void CMakeSetupDialog::ChangeDirectoriesFromFile(const char* buffer)
{ {
std::string file = buffer; // Get the path to this file
if (cmSystemTools::FileIsDirectory(file.c_str()))
std::string path = buffer;
if (!cmSystemTools::FileIsDirectory(path.c_str()))
{ {
this->m_WhereSource = this->m_WhereBuild = file.c_str(); path = cmSystemTools::GetFilenamePath(path);
} }
else else
{ {
std::string name = cmSystemTools::GetFilenameName(file); cmSystemTools::ConvertToUnixSlashes(path);
std::string path = cmSystemTools::GetFilenamePath(file); }
path = cmSystemTools::ConvertToOutputPath(path.c_str());
this->m_WhereBuild = path.c_str(); // Check if it's a build dir and grab the cache
std::string cache_file = path;
cache_file += "/CMakeCache.txt";
cmCacheManager *cache = cmCacheManager::GetInstance(); cmCacheManager *cache = cmCacheManager::GetInstance();
if (name == "CMakeCache.txt" &&
if (cmSystemTools::FileExists(cache_file.c_str()) &&
cache->LoadCache(path.c_str()) && cache->LoadCache(path.c_str()) &&
cache->GetCacheEntry("CMAKE_HOME_DIRECTORY")) cache->GetCacheEntry("CMAKE_HOME_DIRECTORY"))
{ {
path = cmSystemTools::ConvertToOutputPath(cache->GetCacheEntry("CMAKE_HOME_DIRECTORY")->m_Value.c_str()); path = cmSystemTools::ConvertToOutputPath(path.c_str());
} this->m_WhereBuild = path.c_str();
path = cmSystemTools::ConvertToOutputPath(
cache->GetCacheEntry("CMAKE_HOME_DIRECTORY")->m_Value.c_str());
this->m_WhereSource = path.c_str(); this->m_WhereSource = path.c_str();
} }
else
{
path = cmSystemTools::ConvertToOutputPath(path.c_str());
this->m_WhereSource = this->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