summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2003-04-17 12:03:55 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2003-04-17 12:03:55 (GMT)
commit3823f5547b65f9ff494b30e32f8305bcc08e9dbe (patch)
treee7dff024c256585dbcc82c14adf150189cdd3418
parent1181ac5ee71f820ac8363b12d262fbff509ce5e2 (diff)
downloadCMake-3823f5547b65f9ff494b30e32f8305bcc08e9dbe.zip
CMake-3823f5547b65f9ff494b30e32f8305bcc08e9dbe.tar.gz
CMake-3823f5547b65f9ff494b30e32f8305bcc08e9dbe.tar.bz2
BUG: fix compile error on windows because of windows.h
-rw-r--r--Source/cmCommands.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/cmCommands.cxx b/Source/cmCommands.cxx
index e3fbf7e..11cef04 100644
--- a/Source/cmCommands.cxx
+++ b/Source/cmCommands.cxx
@@ -83,7 +83,6 @@
#include "cmIncludeExternalMSProjectCommand.cxx"
#include "cmLinkLibrariesCommand.cxx"
#include "cmLoadCacheCommand.cxx"
-#include "cmLoadCommandCommand.cxx"
#include "cmOutputRequiredFilesCommand.cxx"
#include "cmRemoveCommand.cxx"
#include "cmSeparateArgumentsCommand.cxx"
@@ -101,6 +100,12 @@
#include "cmUseMangledMesaCommand.cxx"
#include "cmUtilitySourceCommand.cxx"
#include "cmWrapExcludeFilesCommand.cxx"
+
+// This one must be last because it includes windows.h and
+// windows.h #defines GetCurrentDirectory which is a member
+// of cmMakefile
+#include "cmLoadCommandCommand.cxx"
+
#endif
void GetPredefinedCommands(std::list<cmCommand*>& commands)