BUG: fix compile error on windows because of windows.h
This commit is contained in:
parent
1181ac5ee7
commit
3823f5547b
|
@ -83,7 +83,6 @@
|
||||||
#include "cmIncludeExternalMSProjectCommand.cxx"
|
#include "cmIncludeExternalMSProjectCommand.cxx"
|
||||||
#include "cmLinkLibrariesCommand.cxx"
|
#include "cmLinkLibrariesCommand.cxx"
|
||||||
#include "cmLoadCacheCommand.cxx"
|
#include "cmLoadCacheCommand.cxx"
|
||||||
#include "cmLoadCommandCommand.cxx"
|
|
||||||
#include "cmOutputRequiredFilesCommand.cxx"
|
#include "cmOutputRequiredFilesCommand.cxx"
|
||||||
#include "cmRemoveCommand.cxx"
|
#include "cmRemoveCommand.cxx"
|
||||||
#include "cmSeparateArgumentsCommand.cxx"
|
#include "cmSeparateArgumentsCommand.cxx"
|
||||||
|
@ -101,6 +100,12 @@
|
||||||
#include "cmUseMangledMesaCommand.cxx"
|
#include "cmUseMangledMesaCommand.cxx"
|
||||||
#include "cmUtilitySourceCommand.cxx"
|
#include "cmUtilitySourceCommand.cxx"
|
||||||
#include "cmWrapExcludeFilesCommand.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
|
#endif
|
||||||
|
|
||||||
void GetPredefinedCommands(std::list<cmCommand*>& commands)
|
void GetPredefinedCommands(std::list<cmCommand*>& commands)
|
||||||
|
|
Loading…
Reference in New Issue