diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2001-05-24 16:57:33 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2001-05-24 16:57:33 (GMT) |
| commit | 5731bc9d54036b28d4fce428cc218bb207c63411 (patch) | |
| tree | 39caed87c95dc064689d064469ca5d9b01a7db00 /Source/MFCDialog | |
| parent | ad92f34fea4c565a3f6698c5bc620797be9c64fe (diff) | |
| download | CMake-5731bc9d54036b28d4fce428cc218bb207c63411.zip CMake-5731bc9d54036b28d4fce428cc218bb207c63411.tar.gz CMake-5731bc9d54036b28d4fce428cc218bb207c63411.tar.bz2 | |
ENH: change the syntax of the SET command, fix the combo box for larger strings
Diffstat (limited to 'Source/MFCDialog')
| -rw-r--r-- | Source/MFCDialog/CMakeSetup.rc | 8 | ||||
| -rw-r--r-- | Source/MFCDialog/CMakeSetupDialog.cpp | 11 |
2 files changed, 6 insertions, 13 deletions
diff --git a/Source/MFCDialog/CMakeSetup.rc b/Source/MFCDialog/CMakeSetup.rc index 8be968b..4688cb8 100644 --- a/Source/MFCDialog/CMakeSetup.rc +++ b/Source/MFCDialog/CMakeSetup.rc @@ -104,10 +104,10 @@ BEGIN WS_HSCROLL | WS_TABSTOP CTEXT "Right click on cache entries for additional options", IDC_STATIC,19,190,333,11 - COMBOBOX IDC_WhereBuild,147,25,133,68,CBS_DROPDOWN | WS_VSCROLL | - WS_TABSTOP - COMBOBOX IDC_WhereSource,147,5,133,66,CBS_DROPDOWN | WS_VSCROLL | - WS_TABSTOP + COMBOBOX IDC_WhereBuild,129,26,133,68,CBS_DROPDOWN | + CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_WhereSource,127,6,135,66,CBS_DROPDOWN | + CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP LTEXT "Static",IDC_CMAKE_VERSION,3,211,70,13,SS_CENTERIMAGE END diff --git a/Source/MFCDialog/CMakeSetupDialog.cpp b/Source/MFCDialog/CMakeSetupDialog.cpp index c93e652..804496e 100644 --- a/Source/MFCDialog/CMakeSetupDialog.cpp +++ b/Source/MFCDialog/CMakeSetupDialog.cpp @@ -137,6 +137,8 @@ BOOL CMakeSetupDialog::OnInitDialog() this->LoadFromRegistry(); // try to load the cmake cache from disk this->LoadCacheFromDiskToGUI(); + m_WhereBuildControl.LimitText(2048); + m_WhereSourceControl.LimitText(2048); // Set the version number char tmp[1024]; sprintf(tmp,"Version %s", cmMakefile::GetVersion()); @@ -435,15 +437,6 @@ void CMakeSetupDialog::OnBuildProjects() CString makefileIn = m_WhereSource; makefileIn += "/CMakeLists.txt"; makefile.ReadListFile(makefileIn); - if(!cmCacheManager::GetInstance()->GetCacheValue("CMAKE_CXX")) - { - if(!makefile.GetDefinition("CMAKE_CXX")) - { - makefile.AddDefinition("CMAKE_CXX", "VC60"); - } - cmCacheManager::GetInstance()->AddCacheEntry("CMAKE_CXX", "VC60", - "Compiler used", cmCacheManager::STRING); - } // Generate the project files makefile.GenerateMakefile(); // Save the cache |