ENH:Reworked CMake for consistency

CMakeRules.make.in → CMakeCommands.make.in

 # rules for building .o files from source files
-@MAKEINCLUDE@ @MAKEQUOTE@@CMAKE_CONFIG_DIR@/CMake/CMakeSimpleRules.make@MAKEQUOTE@
+@MAKEINCLUDE@ @MAKEQUOTE@@CMAKE_CONFIG_DIR@/CMake/CMakeSimpleCommands.make@MAKEQUOTE@
 
 #
 # Makefile for 

CMakeMaster.make.in

@@ -16,6 +16,6 @@ CMAKE_LIB_EXT          = @CMAKE_LIB_EXT@
 
 #------------------------------------------------------------------------------
 # Include General Build Rules
-@MAKEINCLUDE@ @MAKEQUOTE@@CMAKE_CONFIG_DIR@/CMake/CMakeRules.make@MAKEQUOTE@
+@MAKEINCLUDE@ @MAKEQUOTE@@CMAKE_CONFIG_DIR@/CMake/CMakeCommands.make@MAKEQUOTE@
 
 

Source/CMakeSetupCMD.dsp

@@ -91,11 +91,11 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=.\cmAbstractFilesRule.cxx
+SOURCE=.\cmAbstractFilesCommand.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmAddTargetRule.cxx
+SOURCE=.\cmAddTargetCommand.cxx
 # End Source File
 # Begin Source File
 
@@ -103,7 +103,7 @@ SOURCE=.\CMakeSetupCMD.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmAuxSourceDirectoryRule.cxx
+SOURCE=.\cmAuxSourceDirectoryCommand.cxx
 # End Source File
 # Begin Source File
 
@@ -123,35 +123,35 @@ SOURCE=.\cmDSWMakefile.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmExecutablesRule.cxx
+SOURCE=.\cmExecutablesCommand.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmFindIncludeRule.cxx
+SOURCE=.\cmFindIncludeCommand.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmFindLibraryRule.cxx
+SOURCE=.\cmFindLibraryCommand.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmFindProgramRule.cxx
+SOURCE=.\cmFindProgramCommand.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmIncludeDirectoryRule.cxx
+SOURCE=.\cmIncludeDirectoryCommand.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmLibraryRule.cxx
+SOURCE=.\cmLibraryCommand.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmLinkDirectoriesRule.cxx
+SOURCE=.\cmLinkDirectoriesCommand.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmLinkLibrariesRule.cxx
+SOURCE=.\cmLinkLibrariesCommand.cxx
 # End Source File
 # Begin Source File
 
@@ -171,7 +171,7 @@ SOURCE=.\cmMSProjectGenerator.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmProjectRule.cxx
+SOURCE=.\cmProjectCommand.cxx
 # End Source File
 # Begin Source File
 
@@ -179,15 +179,15 @@ SOURCE=.\cmRegularExpression.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmSourceFilesRequireRule.cxx
+SOURCE=.\cmSourceFilesRequireCommand.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmSourceFilesRule.cxx
+SOURCE=.\cmSourceFilesCommand.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmSubdirRule.cxx
+SOURCE=.\cmSubdirCommand.cxx
 # End Source File
 # Begin Source File
 
@@ -195,23 +195,23 @@ SOURCE=.\cmSystemTools.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmTestsRule.cxx
+SOURCE=.\cmTestsCommand.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmUnixDefinesRule.cxx
+SOURCE=.\cmUnixDefinesCommand.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmUnixLibrariesRule.cxx
+SOURCE=.\cmUnixLibrariesCommand.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmWin32DefinesRule.cxx
+SOURCE=.\cmWin32DefinesCommand.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmWin32LibrariesRule.cxx
+SOURCE=.\cmWin32LibrariesCommand.cxx
 # End Source File
 # Begin Source File
 
@@ -223,15 +223,15 @@ SOURCE=.\cmWindowsConfigure.cxx
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=.\cmAbstractFilesRule.h
+SOURCE=.\cmAbstractFilesCommand.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmAddTargetRule.h
+SOURCE=.\cmAddTargetCommand.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmAuxSourceDirectoryRule.h
+SOURCE=.\cmAuxSourceDirectoryCommand.h
 # End Source File
 # Begin Source File
 
@@ -251,35 +251,35 @@ SOURCE=.\cmDSWMakefile.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmExecutablesRule.h
+SOURCE=.\cmExecutablesCommand.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmFindIncludeRule.h
+SOURCE=.\cmFindIncludeCommand.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmFindLibraryRule.h
+SOURCE=.\cmFindLibraryCommand.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmFindProgramRule.h
+SOURCE=.\cmFindProgramCommand.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmIncludeDirectoryRule.h
+SOURCE=.\cmIncludeDirectoryCommand.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmLibraryRule.h
+SOURCE=.\cmLibraryCommand.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmLinkDirectoriesRule.h
+SOURCE=.\cmLinkDirectoriesCommand.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmLinkLibrariesRule.h
+SOURCE=.\cmLinkLibrariesCommand.h
 # End Source File
 # Begin Source File
 
@@ -303,7 +303,7 @@ SOURCE=.\cmMSProjectGenerator.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmProjectRule.h
+SOURCE=.\cmProjectCommand.h
 # End Source File
 # Begin Source File
 
@@ -311,11 +311,11 @@ SOURCE=.\cmRegularExpression.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmRuleMaker.h
+SOURCE=.\cmCommand.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmSourceFilesRule.h
+SOURCE=.\cmSourceFilesCommand.h
 # End Source File
 # Begin Source File
 
@@ -323,7 +323,7 @@ SOURCE=.\cmStandardIncludes.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmSubdirRule.h
+SOURCE=.\cmSubdirCommand.h
 # End Source File
 # Begin Source File
 
@@ -331,23 +331,23 @@ SOURCE=.\cmSystemTools.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmTestsRule.h
+SOURCE=.\cmTestsCommand.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmUnixDefinesRule.h
+SOURCE=.\cmUnixDefinesCommand.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmUnixLibrariesRule.h
+SOURCE=.\cmUnixLibrariesCommand.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmWin32DefinesRule.h
+SOURCE=.\cmWin32DefinesCommand.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\cmWin32LibrariesRule.h
+SOURCE=.\cmWin32LibrariesCommand.h
 # End Source File
 # Begin Source File
 

Source/MFCDialog/CMakeSetup.dsp

@@ -92,11 +92,11 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\cmAbstractFilesRule.cxx
+SOURCE=..\cmAbstractFilesCommand.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmAddTargetRule.cxx
+SOURCE=..\cmAddTargetCommand.cxx
 # End Source File
 # Begin Source File
 
@@ -116,7 +116,7 @@ SOURCE=.\CMakeSetupDialog.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmAuxSourceDirectoryRule.cxx
+SOURCE=..\cmAuxSourceDirectoryCommand.cxx
 # End Source File
 # Begin Source File
 
@@ -136,35 +136,35 @@ SOURCE=..\cmDSWMakefile.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmExecutablesRule.cxx
+SOURCE=..\cmExecutablesCommand.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmFindIncludeRule.cxx
+SOURCE=..\cmFindIncludeCommand.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmFindLibraryRule.cxx
+SOURCE=..\cmFindLibraryCommand.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmFindProgramRule.cxx
+SOURCE=..\cmFindProgramCommand.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmIncludeDirectoryRule.cxx
+SOURCE=..\cmIncludeDirectoryCommand.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmLibraryRule.cxx
+SOURCE=..\cmLibraryCommand.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmLinkDirectoriesRule.cxx
+SOURCE=..\cmLinkDirectoriesCommand.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmLinkLibrariesRule.cxx
+SOURCE=..\cmLinkLibrariesCommand.cxx
 # End Source File
 # Begin Source File
 
@@ -184,7 +184,7 @@ SOURCE=..\cmMSProjectGenerator.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmProjectRule.cxx
+SOURCE=..\cmProjectCommand.cxx
 # End Source File
 # Begin Source File
 
@@ -192,15 +192,15 @@ SOURCE=..\cmRegularExpression.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmSourceFilesRequireRule.cxx
+SOURCE=..\cmSourceFilesRequireCommand.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmSourceFilesRule.cxx
+SOURCE=..\cmSourceFilesCommand.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmSubdirRule.cxx
+SOURCE=..\cmSubdirCommand.cxx
 # End Source File
 # Begin Source File
 
@@ -208,23 +208,23 @@ SOURCE=..\cmSystemTools.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmTestsRule.cxx
+SOURCE=..\cmTestsCommand.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmUnixDefinesRule.cxx
+SOURCE=..\cmUnixDefinesCommand.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmUnixLibrariesRule.cxx
+SOURCE=..\cmUnixLibrariesCommand.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmWin32DefinesRule.cxx
+SOURCE=..\cmWin32DefinesCommand.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmWin32LibrariesRule.cxx
+SOURCE=..\cmWin32LibrariesCommand.cxx
 # End Source File
 # Begin Source File
 
@@ -241,11 +241,11 @@ SOURCE=.\StdAfx.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=..\cmAbstractFilesRule.h
+SOURCE=..\cmAbstractFilesCommand.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmAddTargetRule.h
+SOURCE=..\cmAddTargetCommand.h
 # End Source File
 # Begin Source File
 
@@ -261,7 +261,7 @@ SOURCE=.\CMakeSetupDialog.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmAuxSourceDirectoryRule.h
+SOURCE=..\cmAuxSourceDirectoryCommand.h
 # End Source File
 # Begin Source File
 
@@ -289,35 +289,35 @@ SOURCE=..\cmDSWMakefile.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmExecutablesRule.h
+SOURCE=..\cmExecutablesCommand.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmFindIncludeRule.h
+SOURCE=..\cmFindIncludeCommand.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmFindLibraryRule.h
+SOURCE=..\cmFindLibraryCommand.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmFindProgramRule.h
+SOURCE=..\cmFindProgramCommand.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmIncludeDirectoryRule.h
+SOURCE=..\cmIncludeDirectoryCommand.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmLibraryRule.h
+SOURCE=..\cmLibraryCommand.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmLinkDirectoriesRule.h
+SOURCE=..\cmLinkDirectoriesCommand.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmLinkLibrariesRule.h
+SOURCE=..\cmLinkLibrariesCommand.h
 # End Source File
 # Begin Source File
 
@@ -341,7 +341,7 @@ SOURCE=..\cmMSProjectGenerator.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmProjectRule.h
+SOURCE=..\cmProjectCommand.h
 # End Source File
 # Begin Source File
 
@@ -349,15 +349,15 @@ SOURCE=..\cmRegularExpression.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmRuleMaker.h
+SOURCE=..\cmCommandMaker.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmSourceFilesRequireRule.h
+SOURCE=..\cmSourceFilesRequireCommand.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmSourceFilesRule.h
+SOURCE=..\cmSourceFilesCommand.h
 # End Source File
 # Begin Source File
 
@@ -365,7 +365,7 @@ SOURCE=..\cmStandardIncludes.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmSubdirRule.h
+SOURCE=..\cmSubdirCommand.h
 # End Source File
 # Begin Source File
 
@@ -373,23 +373,23 @@ SOURCE=..\cmSystemTools.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmTestsRule.h
+SOURCE=..\cmTestsCommand.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmUnixDefinesRule.h
+SOURCE=..\cmUnixDefinesCommand.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmUnixLibrariesRule.h
+SOURCE=..\cmUnixLibrariesCommand.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmWin32DefinesRule.h
+SOURCE=..\cmWin32DefinesCommand.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\cmWin32LibrariesRule.h
+SOURCE=..\cmWin32LibrariesCommand.h
 # End Source File
 # Begin Source File
 

Source/Makefile.in

@@ -4,73 +4,73 @@ VPATH         = @srcdir@
 
 # DO NOT INCLUDE CMakeMaster.make here!
 # This will cause an infinite loop as it will add the
-# rule for changing into this directory
+# command for changing into this directory
 
 @MAKEINCLUDE@ @MAKEQUOTE@@CMAKE_CONFIG_DIR@/CMake/CMakeVariables.make@MAKEQUOTE@
-@MAKEINCLUDE@ @MAKEQUOTE@@CMAKE_CONFIG_DIR@/CMake/CMakeSimpleRules.make@MAKEQUOTE@
+@MAKEINCLUDE@ @MAKEQUOTE@@CMAKE_CONFIG_DIR@/CMake/CMakeSimpleCommands.make@MAKEQUOTE@
 
 OBJS = \
 CMakeBuildTargets.o  \
 cmMakeDepend.o \
 cmMakefile.o \
-cmAbstractFilesRule.o \
+cmAbstractFilesCommand.o \
 cmMakefileGenerator.o \
-cmAddTargetRule.o  \
-cmProjectRule.o \
-cmAuxSourceDirectoryRule.o \
+cmAddTargetCommand.o  \
+cmProjectCommand.o \
+cmAuxSourceDirectoryCommand.o \
 cmRegularExpression.o \
 cmClassFile.o \
-cmSourceFilesRule.o \
-cmSourceFilesRequireRule.o \
-cmSubdirRule.o \
+cmSourceFilesCommand.o \
+cmSourceFilesRequireCommand.o \
+cmSubdirCommand.o \
 cmSystemTools.o \
 cmDirectory.o \
-cmUnixDefinesRule.o \
-cmExecutablesRule.o \
-cmTestsRule.o \
-cmUnixLibrariesRule.o \
-cmFindIncludeRule.o \
-cmFindLibraryRule.o \
+cmUnixDefinesCommand.o \
+cmExecutablesCommand.o \
+cmTestsCommand.o \
+cmUnixLibrariesCommand.o \
+cmFindIncludeCommand.o \
+cmFindLibraryCommand.o \
 cmUnixMakefileGenerator.o \
-cmFindProgramRule.o \
-cmIncludeDirectoryRule.o \
-cmWin32DefinesRule.o \
-cmLibraryRule.o \
-cmWin32LibrariesRule.o \
-cmLinkDirectoriesRule.o \
-cmLinkLibrariesRule.o 
+cmFindProgramCommand.o \
+cmIncludeDirectoryCommand.o \
+cmWin32DefinesCommand.o \
+cmLibraryCommand.o \
+cmWin32LibrariesCommand.o \
+cmLinkDirectoriesCommand.o \
+cmLinkLibrariesCommand.o 
 
 
 cmCollectFlags.o : $(srcdir)/*.h 
 CMakeBuildTargets.o  : $(srcdir)/*.h
 cmMakeDepend.o : $(srcdir)/*.h
 cmMakefile.o : $(srcdir)/*.h
-cmAbstractFilesRule.o : $(srcdir)/*.h
+cmAbstractFilesCommand.o : $(srcdir)/*.h
 cmMakefileGenerator.o : $(srcdir)/*.h
-cmAddTargetRule.o  : $(srcdir)/*.h
-cmProjectRule.o : $(srcdir)/*.h
-cmAuxSourceDirectoryRule.o : $(srcdir)/*.h
+cmAddTargetCommand.o  : $(srcdir)/*.h
+cmProjectCommand.o : $(srcdir)/*.h
+cmAuxSourceDirectoryCommand.o : $(srcdir)/*.h
 cmRegularExpression.o : $(srcdir)/*.h
 cmClassFile.o : $(srcdir)/*.h
-cmSourceFilesRule.o : $(srcdir)/*.h
-cmSourceFilesRequireRule.o : $(srcdir)/*.h
-cmSubdirRule.o : $(srcdir)/*.h
+cmSourceFilesCommand.o : $(srcdir)/*.h
+cmSourceFilesRequireCommand.o : $(srcdir)/*.h
+cmSubdirCommand.o : $(srcdir)/*.h
 cmSystemTools.o : $(srcdir)/*.h
 cmDirectory.o : $(srcdir)/*.h
-cmUnixDefinesRule.o : $(srcdir)/*.h
-cmExecutablesRule.o : $(srcdir)/*.h
-cmTestsRule.o : $(srcdir)/*.h
-cmUnixLibrariesRule.o : $(srcdir)/*.h
-cmFindIncludeRule.o : $(srcdir)/*.h
-cmFindLibraryRule.o : $(srcdir)/*.h
+cmUnixDefinesCommand.o : $(srcdir)/*.h
+cmExecutablesCommand.o : $(srcdir)/*.h
+cmTestsCommand.o : $(srcdir)/*.h
+cmUnixLibrariesCommand.o : $(srcdir)/*.h
+cmFindIncludeCommand.o : $(srcdir)/*.h
+cmFindLibraryCommand.o : $(srcdir)/*.h
 cmUnixMakefileGenerator.o : $(srcdir)/*.h
-cmFindProgramRule.o : $(srcdir)/*.h
-cmIncludeDirectoryRule.o : $(srcdir)/*.h
-cmWin32DefinesRule.o : $(srcdir)/*.h
-cmLibraryRule.o : $(srcdir)/*.h
-cmWin32LibrariesRule.o : $(srcdir)/*.h
-cmLinkDirectoriesRule.o : $(srcdir)/*.h 
-cmLinkLibrariesRule.o  : $(srcdir)/*.h 
+cmFindProgramCommand.o : $(srcdir)/*.h
+cmIncludeDirectoryCommand.o : $(srcdir)/*.h
+cmWin32DefinesCommand.o : $(srcdir)/*.h
+cmLibraryCommand.o : $(srcdir)/*.h
+cmWin32LibrariesCommand.o : $(srcdir)/*.h
+cmLinkDirectoriesCommand.o : $(srcdir)/*.h 
+cmLinkLibrariesCommand.o  : $(srcdir)/*.h 
 
 
 CMakeBuildTargets: ${OBJS}

Source/cmAbstractFilesRule.cxx → Source/cmAbstractFilesCommand.cxx

@@ -13,10 +13,10 @@
   See COPYRIGHT.txt for copyright details.
 
 =========================================================================*/
-#include "cmAbstractFilesRule.h"
+#include "cmAbstractFilesCommand.h"
 
-// cmAbstractFilesRule
-bool cmAbstractFilesRule::Invoke(std::vector<std::string>& args)
+// cmAbstractFilesCommand
+bool cmAbstractFilesCommand::Invoke(std::vector<std::string>& args)
 {
   if(args.size() < 1 )
     {

Source/cmAbstractFilesRule.h → Source/cmAbstractFilesCommand.h

@@ -13,34 +13,28 @@
   See COPYRIGHT.txt for copyright details.