diff options
| -rw-r--r-- | Source/MFCDialog/CMakeSetup.rc | 19 | ||||
| -rw-r--r-- | Source/MFCDialog/CMakeSetupDialog.cpp | 4 | ||||
| -rw-r--r-- | Source/MFCDialog/resource.h | 3 | ||||
| -rw-r--r-- | Source/cmMakefile.h | 5 | ||||
| -rw-r--r-- | Source/cmake.cxx | 10 |
5 files changed, 24 insertions, 17 deletions
diff --git a/Source/MFCDialog/CMakeSetup.rc b/Source/MFCDialog/CMakeSetup.rc index ef1c96a..8be968b 100644 --- a/Source/MFCDialog/CMakeSetup.rc +++ b/Source/MFCDialog/CMakeSetup.rc @@ -89,25 +89,26 @@ IDD_CMakeSetupDialog_DIALOG DIALOGEX 0, 0, 375, 226 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW CAPTION "CMakeSetupDialog" -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Sans Serif" BEGIN - DEFPUSHBUTTON "Close",IDOK,231,206,50,14 - PUSHBUTTON "Browse...",IDC_BUTTON2,269,5,43,13 - LTEXT "Where is the source code:",IDC_STATIC,39,6,86,9 - PUSHBUTTON "Browse...",IDC_BUTTON3,268,25,43,13 - LTEXT "Where do you want to build the binaries:",IDC_STATIC,1, + DEFPUSHBUTTON "Close",IDOK,219,206,50,14 + PUSHBUTTON "Browse...",IDC_BUTTON2,286,5,43,13 + RTEXT "Where is the source code:",IDC_STATIC,52,6,86,9 + PUSHBUTTON "Browse...",IDC_BUTTON3,286,25,43,13 + RTEXT "Where do you want to build the binaries:",IDC_STATIC,10, 27,128,9 - PUSHBUTTON "Build Project Files",IDC_BuildProjects,81,205,67,15 + PUSHBUTTON "Build Project Files",IDC_BuildProjects,95,205,67,15 GROUPBOX "Cache Values",IDC_STATIC,9,43,356,141 LISTBOX IDC_LIST2,15,55,344,122,LBS_OWNERDRAWVARIABLE | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP CTEXT "Right click on cache entries for additional options", IDC_STATIC,19,190,333,11 - COMBOBOX IDC_WhereBuild,129,26,133,68,CBS_DROPDOWN | WS_VSCROLL | + COMBOBOX IDC_WhereBuild,147,25,133,68,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_WhereSource,127,6,135,66,CBS_DROPDOWN | WS_VSCROLL | + COMBOBOX IDC_WhereSource,147,5,133,66,CBS_DROPDOWN | 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 419024b..c93e652 100644 --- a/Source/MFCDialog/CMakeSetupDialog.cpp +++ b/Source/MFCDialog/CMakeSetupDialog.cpp @@ -137,6 +137,10 @@ BOOL CMakeSetupDialog::OnInitDialog() this->LoadFromRegistry(); // try to load the cmake cache from disk this->LoadCacheFromDiskToGUI(); + // Set the version number + char tmp[1024]; + sprintf(tmp,"Version %s", cmMakefile::GetVersion()); + SetDlgItemText(IDC_CMAKE_VERSION, tmp); return TRUE; // return TRUE unless you set the focus to a control } diff --git a/Source/MFCDialog/resource.h b/Source/MFCDialog/resource.h index 69771e0..cd9347b 100644 --- a/Source/MFCDialog/resource.h +++ b/Source/MFCDialog/resource.h @@ -14,6 +14,7 @@ #define IDC_BuildProjects 1006 #define IDC_LIST2 1007 #define IDC_LIST3 1010 +#define IDC_CMAKE_VERSION 1014 // Next default values for new objects // @@ -21,7 +22,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 133 #define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1014 +#define _APS_NEXT_CONTROL_VALUE 1015 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index f7f2bf4..8e1db98 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -62,6 +62,11 @@ class cmMakefile { public: /** + * Return a string version number for CMake + */ + static const char *GetVersion() {return "0.1";} + + /** * Construct an empty makefile. */ cmMakefile(); diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 00bbfdb..0168719 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -61,13 +61,9 @@ int main(int ac, char** av) void cmake::Usage(const char* program) { - std::cerr << "Usage: " << program << " srcdir " - << "-Ssource_start_directory " - << "-Ooutput_start_directory " - << "-Hsource_home_directory " - << "-Boutput_home_directory\n" - << "Where start directories are the current place in the tree," - "and the home directories are the top.\n"; + std::cerr << "cmake version " << cmMakefile::GetVersion() << "\n"; + std::cerr << "Usage: " << program << " srcdir \n" + << "Where cmake is run from the directory where you want the object files written\n"; } // Parse the args |