Bladeren bron

fix include order because of GetCurrentDirectory define and windows.h problem

Bill Hoffman 21 jaren geleden
bovenliggende
commit
1d061ae896

+ 0 - 1
Source/cmGlobalVisualStudio6Generator.cxx

@@ -216,7 +216,6 @@ void cmGlobalVisualStudio6Generator::WriteDSWFile(std::ostream& fout,
   this->WriteDSWHeader(fout);
   
   // Get the home directory with the trailing slash
-#undef GetCurrentDirectory
   std::string homedir = root->GetMakefile()->GetCurrentDirectory();
   homedir += "/";
     

+ 2 - 2
Source/cmGlobalVisualStudio71Generator.cxx

@@ -14,11 +14,12 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+#include "windows.h" // this must be first to define GetCurrentDirectory
 #include "cmGlobalVisualStudio71Generator.h"
 #include "cmLocalVisualStudio7Generator.h"
 #include "cmMakefile.h"
 #include "cmake.h"
-#include "windows.h"
+
 
 
 cmGlobalVisualStudio71Generator::cmGlobalVisualStudio71Generator()
@@ -48,7 +49,6 @@ void cmGlobalVisualStudio71Generator::WriteSLNFile(std::ostream& fout,
   this->WriteSLNHeader(fout);
   
   // Get the home directory with the trailing slash
-  #undef GetCurrentDirectory
   std::string homedir = root->GetMakefile()->GetCurrentDirectory();
   homedir += "/";
   bool doneAllBuild = false;

+ 1 - 2
Source/cmGlobalVisualStudio7Generator.cxx

@@ -14,12 +14,12 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+#include "windows.h" // this must be first to define GetCurrentDirectory
 #include "cmGlobalVisualStudio7Generator.h"
 #include "cmLocalVisualStudio7Generator.h"
 #include "cmGeneratedFileStream.h"
 #include "cmMakefile.h"
 #include "cmake.h"
-#include "windows.h"
 
 
 cmGlobalVisualStudio7Generator::cmGlobalVisualStudio7Generator()
@@ -316,7 +316,6 @@ void cmGlobalVisualStudio7Generator::WriteSLNFile(std::ostream& fout,
   this->WriteSLNHeader(fout);
   
   // Get the home directory with the trailing slash
-#undef GetCurrentDirectory
   std::string homedir = root->GetMakefile()->GetCurrentDirectory();
   homedir += "/";
   bool doneAllBuild = false;