mirror of
https://github.com/reactos/CMake.git
synced 2024-11-24 12:09:48 +00:00
ENH: add ability to run from different directories
This commit is contained in:
parent
0798a177ea
commit
f76a992ff9
@ -65,13 +65,35 @@ BEGIN_MESSAGE_MAP(CAboutDlg, CDialog)
|
|||||||
CMakeSetupDialog::CMakeSetupDialog(CWnd* pParent /*=NULL*/)
|
CMakeSetupDialog::CMakeSetupDialog(CWnd* pParent /*=NULL*/)
|
||||||
: CDialog(CMakeSetupDialog::IDD, pParent)
|
: CDialog(CMakeSetupDialog::IDD, pParent)
|
||||||
{
|
{
|
||||||
|
CString startPath = _pgmptr;
|
||||||
|
startPath.Replace('\\', '_');
|
||||||
|
startPath.Replace(':', '_');
|
||||||
|
startPath.Replace(".EXE", "");
|
||||||
|
startPath.Replace(".exe", "");
|
||||||
|
m_RegistryKey = "Software\\Kitware\\CMakeSetup\\Settings\\";
|
||||||
|
// _pgmptr should be the directory from which cmake was run from
|
||||||
|
// use it as the unique key for the dialog
|
||||||
|
m_RegistryKey += startPath;
|
||||||
|
|
||||||
//{{AFX_DATA_INIT(CMakeSetupDialog)
|
//{{AFX_DATA_INIT(CMakeSetupDialog)
|
||||||
m_WhereSource = _T("");
|
m_WhereSource = _T("");
|
||||||
m_WhereBuild = _T("");
|
m_WhereBuild = _T("");
|
||||||
//}}AFX_DATA_INIT
|
//}}AFX_DATA_INIT
|
||||||
// Note that LoadIcon does not require a subsequent DestroyIcon in Win32
|
// Note that LoadIcon does not require a subsequent DestroyIcon in Win32
|
||||||
m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
|
m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
|
||||||
m_WhereSource = _T("");
|
// Guess the initial source directory based on the location
|
||||||
|
// of this program, it should be in CMake/Source/
|
||||||
|
startPath = _pgmptr;
|
||||||
|
int removePos = startPath.Find("\\CMake\\Source");
|
||||||
|
if(removePos == -1)
|
||||||
|
{
|
||||||
|
removePos = startPath.Find("/CMake/Source");
|
||||||
|
}
|
||||||
|
if(removePos != -1)
|
||||||
|
{
|
||||||
|
startPath = startPath.Left(removePos);
|
||||||
|
}
|
||||||
|
m_WhereSource = startPath;
|
||||||
this->LoadFromRegistry();
|
this->LoadFromRegistry();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -273,7 +295,7 @@ void CMakeSetupDialog::SaveToRegistry()
|
|||||||
DWORD dwDummy;
|
DWORD dwDummy;
|
||||||
|
|
||||||
if(RegCreateKeyEx(HKEY_CURRENT_USER,
|
if(RegCreateKeyEx(HKEY_CURRENT_USER,
|
||||||
_T("Software\\Kitware\\CMakeSetup\\Settings"),
|
m_RegistryKey,
|
||||||
0, "", REG_OPTION_NON_VOLATILE, KEY_READ|KEY_WRITE,
|
0, "", REG_OPTION_NON_VOLATILE, KEY_READ|KEY_WRITE,
|
||||||
NULL, &hKey, &dwDummy) != ERROR_SUCCESS)
|
NULL, &hKey, &dwDummy) != ERROR_SUCCESS)
|
||||||
{
|
{
|
||||||
@ -294,9 +316,9 @@ void CMakeSetupDialog::SaveToRegistry()
|
|||||||
|
|
||||||
|
|
||||||
void CMakeSetupDialog::ReadRegistryValue(HKEY hKey,
|
void CMakeSetupDialog::ReadRegistryValue(HKEY hKey,
|
||||||
CString *val,
|
CString *val,
|
||||||
char *key,
|
const char *key,
|
||||||
char *adefault)
|
const char *adefault)
|
||||||
{
|
{
|
||||||
DWORD dwType, dwSize;
|
DWORD dwType, dwSize;
|
||||||
char *pb;
|
char *pb;
|
||||||
@ -321,7 +343,7 @@ void CMakeSetupDialog::LoadFromRegistry()
|
|||||||
{
|
{
|
||||||
HKEY hKey;
|
HKEY hKey;
|
||||||
if(RegOpenKeyEx(HKEY_CURRENT_USER,
|
if(RegOpenKeyEx(HKEY_CURRENT_USER,
|
||||||
_T("Software\\Kitware\\CMakeSetup\\Settings"),
|
m_RegistryKey,
|
||||||
0, KEY_READ, &hKey) != ERROR_SUCCESS)
|
0, KEY_READ, &hKey) != ERROR_SUCCESS)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
|
@ -22,8 +22,8 @@ protected:
|
|||||||
void LoadFromRegistry();
|
void LoadFromRegistry();
|
||||||
void ReadRegistryValue(HKEY hKey,
|
void ReadRegistryValue(HKEY hKey,
|
||||||
CString *val,
|
CString *val,
|
||||||
char *key,
|
const char *key,
|
||||||
char *adefault);
|
const char *aadefault);
|
||||||
// Dialog Data
|
// Dialog Data
|
||||||
//{{AFX_DATA(CMakeSetupDialog)
|
//{{AFX_DATA(CMakeSetupDialog)
|
||||||
enum { IDD = IDD_CMakeSetupDialog_DIALOG };
|
enum { IDD = IDD_CMakeSetupDialog_DIALOG };
|
||||||
@ -40,7 +40,7 @@ protected:
|
|||||||
// Implementation
|
// Implementation
|
||||||
protected:
|
protected:
|
||||||
HICON m_hIcon;
|
HICON m_hIcon;
|
||||||
|
CString m_RegistryKey;
|
||||||
// Generated message map functions
|
// Generated message map functions
|
||||||
//{{AFX_MSG(CMakeSetupDialog)
|
//{{AFX_MSG(CMakeSetupDialog)
|
||||||
virtual BOOL OnInitDialog();
|
virtual BOOL OnInitDialog();
|
||||||
|
Loading…
Reference in New Issue
Block a user