ENH: added a config setup file for CMakeSetup. Cleaned up the names of the source and binary directories

4 files changed, 21 insertions, 22 deletions

diff --git a/Source/MFCDialog/CMakeSetup.dsp b/Source/MFCDialog/CMakeSetup.dsp
index 8a800e0..359c315 100644
--- a/Source/MFCDialog/CMakeSetup.dsp
+++ b/Source/MFCDialog/CMakeSetup.dsp
@@ -144,10 +144,6 @@ SOURCE=..\cmWindowsConfigure.cxx
 # End Source File

 # Begin Source File

 

-SOURCE=..\itkVC60Configure.cxx

-# End Source File

-# Begin Source File

-

 SOURCE=.\StdAfx.cpp

 # ADD CPP /Yc"stdafx.h"

 # End Source File

diff --git a/Source/MFCDialog/CMakeSetup.rc b/Source/MFCDialog/CMakeSetup.rc
index 14794cb..ac37e1d 100644
--- a/Source/MFCDialog/CMakeSetup.rc
+++ b/Source/MFCDialog/CMakeSetup.rc
@@ -95,10 +95,10 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,260,23,50,14
     EDITTEXT        IDC_WhereSource,13,27,135,13,ES_AUTOHSCROLL
     PUSHBUTTON      "Browse...",IDC_BUTTON2,150,28,43,13
-    LTEXT           "Where is the Insight Source",IDC_STATIC,14,15,104,9
-    EDITTEXT        IDC_WhereBuild,16,67,133,13,ES_AUTOHSCROLL
+    LTEXT           "Where is the source code:",IDC_STATIC,15,15,104,9
+    EDITTEXT        IDC_WhereBuild,14,67,133,13,ES_AUTOHSCROLL
     PUSHBUTTON      "Browse...",IDC_BUTTON3,151,66,43,13
-    LTEXT           "Where do you want to build the binaries",IDC_STATIC,16,
+    LTEXT           "Where do you want to build the binaries:",IDC_STATIC,16,
                     56,128,9
 END
 
@@ -161,14 +161,6 @@ BEGIN
         TOPMARGIN, 7
         BOTTOMMARGIN, 48
     END
-
-    IDD_CMAKESETUPDIALOG_DIALOG, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 313
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 193
-    END
 END
 #endif    // APSTUDIO_INVOKED
 
diff --git a/Source/MFCDialog/CMakeSetupDialog.cpp b/Source/MFCDialog/CMakeSetupDialog.cpp
index f3dc17b..38ddb71 100644
--- a/Source/MFCDialog/CMakeSetupDialog.cpp
+++ b/Source/MFCDialog/CMakeSetupDialog.cpp
@@ -5,7 +5,7 @@
 #include "CMakeSetup.h"
 #include "CMakeSetupDialog.h"
 #include "../cmDSWMakefile.h"
-#include "../itkVC60Configure.h"
+#include "../cmWindowsConfigure.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -227,10 +227,21 @@ void CMakeSetupDialog::OnOK()
   this->UpdateData();
   
   // configure the system for VC60
-  itkVC60Configure config;
+  cmWindowsConfigure config;
   config.SetWhereSource(m_WhereSource);
   config.SetWhereBuild(m_WhereBuild);
-  config.Configure();
+  std::string configSrc;
+  configSrc = m_WhereSource;
+  configSrc += "/CMakeSetupConfig.MSC";
+  if(!config.Configure(configSrc.c_str()))
+    { 
+    std::string error = "Error: in configuring system from: ";
+    error += configSrc;
+    error += "\nProject NOT created!";
+    ::MessageBox(0, error.c_str(), "config ERROR", MB_OK);
+    return;
+    }
+  
   
   cmDSWMakefile builder;
   // Set the ITK home directory
diff --git a/Source/MFCDialog/resource.h b/Source/MFCDialog/resource.h
index 51c21d9..0c1b2b7 100644
--- a/Source/MFCDialog/resource.h
+++ b/Source/MFCDialog/resource.h
@@ -1,15 +1,15 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Developer Studio generated include file.
-// Used by pcbuilder.rc
+// Used by CMakeSetup.rc
 //
 #define IDM_ABOUTBOX                    0x0010
 #define IDD_ABOUTBOX                    100
 #define IDS_ABOUTBOX                    101
-#define IDD_CMakeSetupDialog_DIALOG      102
+#define IDD_CMakeSetupDialog_DIALOG     102
 #define IDR_MAINFRAME                   128
-#define IDC_WhereSource                    1001
+#define IDC_WhereSource                 1001
 #define IDC_BUTTON2                     1002
-#define IDC_WhereBuild                   1003
+#define IDC_WhereBuild                  1003
 #define IDC_BUTTON3                     1004
 
 // Next default values for new objects