summaryrefslogtreecommitdiffstats
path: root/Source/MFCDialog
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2001-01-05 16:41:20 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2001-01-05 16:41:20 (GMT)
commitc54a05bfc799f3e88459956ec37698bab22c27f9 (patch)
tree400b2eb0b6853952a4faa8c0fc41b90eb06deaec /Source/MFCDialog
parentd888b5e39d4e01af538b48ad16c2a6a474de34a0 (diff)
downloadCMake-c54a05bfc799f3e88459956ec37698bab22c27f9.zip
CMake-c54a05bfc799f3e88459956ec37698bab22c27f9.tar.gz
CMake-c54a05bfc799f3e88459956ec37698bab22c27f9.tar.bz2
ENH: rework cmake, added ruleMaker classes and changed the syntax of the CMakeLists.txt files.
Diffstat (limited to 'Source/MFCDialog')
-rw-r--r--Source/MFCDialog/CMakeSetup.dsp204
-rw-r--r--Source/MFCDialog/CMakeSetupDialog.cpp24
2 files changed, 215 insertions, 13 deletions
diff --git a/Source/MFCDialog/CMakeSetup.dsp b/Source/MFCDialog/CMakeSetup.dsp
index 359c315..b8dc31c 100644
--- a/Source/MFCDialog/CMakeSetup.dsp
+++ b/Source/MFCDialog/CMakeSetup.dsp
@@ -92,6 +92,14 @@ LINK32=link.exe
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
+SOURCE=..\cmAbstractFilesRule.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmAddTargetRule.cxx
+# End Source File
+# Begin Source File
+
SOURCE=.\CMakeSetup.cpp
# End Source File
# Begin Source File
@@ -100,15 +108,19 @@ SOURCE=.\CMakeSetup.rc
# End Source File
# Begin Source File
+SOURCE=..\CMakeSetupCMD.cxx
+# End Source File
+# Begin Source File
+
SOURCE=.\CMakeSetupDialog.cpp
# End Source File
# Begin Source File
-SOURCE=..\cmClassFile.cxx
+SOURCE=..\cmAuxSourceDirectoryRule.cxx
# End Source File
# Begin Source File
-SOURCE=..\cmCollectFlags.cxx
+SOURCE=..\cmClassFile.cxx
# End Source File
# Begin Source File
@@ -124,6 +136,38 @@ SOURCE=..\cmDSWMakefile.cxx
# End Source File
# Begin Source File
+SOURCE=..\cmExecutablesRule.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmFindIncludeRule.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmFindLibraryRule.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmFindProgramRule.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmIncludeDirectoryRule.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmLibraryRule.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmLinkDirectoriesRule.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmLinkLibrariesRule.cxx
+# End Source File
+# Begin Source File
+
SOURCE=..\cmMakeDepend.cxx
# End Source File
# Begin Source File
@@ -132,14 +176,58 @@ SOURCE=..\cmMakefile.cxx
# End Source File
# Begin Source File
+SOURCE=..\cmMakefileGenerator.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmMSProjectGenerator.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmProjectRule.cxx
+# End Source File
+# Begin Source File
+
SOURCE=..\cmRegularExpression.cxx
# End Source File
# Begin Source File
+SOURCE=..\cmSourceFilesRequireRule.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmSourceFilesRule.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmSubdirRule.cxx
+# End Source File
+# Begin Source File
+
SOURCE=..\cmSystemTools.cxx
# End Source File
# Begin Source File
+SOURCE=..\cmTestsRule.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmUnixDefinesRule.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmUnixLibrariesRule.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmWin32DefinesRule.cxx
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmWin32LibrariesRule.cxx
+# End Source File
+# Begin Source File
+
SOURCE=..\cmWindowsConfigure.cxx
# End Source File
# Begin Source File
@@ -153,6 +241,14 @@ SOURCE=.\StdAfx.cpp
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
+SOURCE=..\cmAbstractFilesRule.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmAddTargetRule.h
+# End Source File
+# Begin Source File
+
SOURCE=..\CMakeSetup.h
# End Source File
# Begin Source File
@@ -165,10 +261,18 @@ SOURCE=.\CMakeSetupDialog.h
# End Source File
# Begin Source File
+SOURCE=..\cmAuxSourceDirectoryRule.h
+# End Source File
+# Begin Source File
+
SOURCE=..\cmClassFile.h
# End Source File
# Begin Source File
+SOURCE=..\cmDirectory.h
+# End Source File
+# Begin Source File
+
SOURCE=..\cmDSPBuilder.h
# End Source File
# Begin Source File
@@ -185,6 +289,38 @@ SOURCE=..\cmDSWMakefile.h
# End Source File
# Begin Source File
+SOURCE=..\cmExecutablesRule.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmFindIncludeRule.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmFindLibraryRule.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmFindProgramRule.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmIncludeDirectoryRule.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmLibraryRule.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmLinkDirectoriesRule.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmLinkLibrariesRule.h
+# End Source File
+# Begin Source File
+
SOURCE=..\cmMakeDepend.h
# End Source File
# Begin Source File
@@ -193,10 +329,74 @@ SOURCE=..\cmMakefile.h
# End Source File
# Begin Source File
+SOURCE=..\cmMakefile2.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmMakefileGenerator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmMSProjectGenerator.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmProjectRule.h
+# End Source File
+# Begin Source File
+
SOURCE=..\cmRegularExpression.h
# End Source File
# Begin Source File
+SOURCE=..\cmRuleMaker.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmSourceFilesRequireRule.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmSourceFilesRule.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmStandardIncludes.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmSubdirRule.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmSystemTools.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmTestsRule.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmUnixDefinesRule.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmUnixLibrariesRule.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmWin32DefinesRule.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmWin32LibrariesRule.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\cmWindowsConfigure.h
+# End Source File
+# Begin Source File
+
SOURCE=.\Resource.h
# End Source File
# Begin Source File
diff --git a/Source/MFCDialog/CMakeSetupDialog.cpp b/Source/MFCDialog/CMakeSetupDialog.cpp
index 0775857..2a01d2c 100644
--- a/Source/MFCDialog/CMakeSetupDialog.cpp
+++ b/Source/MFCDialog/CMakeSetupDialog.cpp
@@ -6,7 +6,7 @@
#include "CMakeSetupDialog.h"
#include "../cmDSWMakefile.h"
#include "../cmWindowsConfigure.h"
-
+#include "../cmMSProjectGenerator.h"
#ifdef _DEBUG
#define new DEBUG_NEW
#undef THIS_FILE
@@ -269,19 +269,21 @@ void CMakeSetupDialog::OnOK()
}
- cmDSWMakefile builder;
- // Set the ITK home directory
- builder.SetHomeDirectory(m_WhereSource);
- // Set the CMakeLists.txt file
- CString makefileIn = m_WhereSource;
- makefileIn += "/CMakeLists.txt";
- builder.ReadMakefile(makefileIn);
+ cmMakefile mf;
+ mf.SetMakefileGenerator(new cmMSProjectGenerator);
+ mf.SetHomeDirectory(m_WhereSource);
+
// Set the output directory
- builder.SetOutputDirectory(m_WhereBuild);
+ mf.SetOutputDirectory(m_WhereBuild);
// set the directory which contains the CMakeLists.txt
- builder.SetCurrentDirectory(m_WhereSource);
+ mf.SetCurrentDirectory(m_WhereSource);
// Create the master DSW file and all children dsp files for ITK
- builder.OutputDSWFile();
+ // Set the CMakeLists.txt file
+ CString makefileIn = m_WhereSource;
+ makefileIn += "/CMakeLists.txt";
+ mf.ReadMakefile(makefileIn);
+ // Move this to the cache editor
+ mf.GenerateMakefile();
CDialog::OnOK();
this->SaveToRegistry();
}
generated by cgit v0.12 at 2025-01-07 09:28:19 (GMT)