Deactivate Vishnu client compilation on Win32 platform (Vishnu not available for...

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b93a6b5d3e7426fe33b23570c1861ae6b9ee3d4b..e88e9743f614a333fc3a69cc5d2af199f33e0b62 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -57,7 +57,11 @@ add_subdirectory (SGE)
 add_subdirectory (SSH)
 add_subdirectory (LoadLeveler)
 add_subdirectory (Slurm)
-add_subdirectory (Vishnu)
+
+# Vishnu is not available for Windows
+IF (NOT WIN32)
+    add_subdirectory (Vishnu)
+ENDIF (NOT WIN32)
 
 # Make a copy of the built value and clear the built value for the next run of cmake
 SET(SRC_FILES ${SRC_FILES_BUILD} CACHE INTERNAL "")

diff --git a/src/Vishnu/Batch_BatchManager_eVishnu.cxx b/src/Vishnu/Batch_BatchManager_eVishnu.cxx
index df14196ec556505c32f0c123db73780093aa6211..7ac2ee57c1ceb9bc5323667c229abc285f85f534 100644 (file)
--- a/src/Vishnu/Batch_BatchManager_eVishnu.cxx
+++ b/src/Vishnu/Batch_BatchManager_eVishnu.cxx
@@ -31,10 +31,6 @@
 #include <fstream>
 #include <sstream>
 
-#ifdef WIN32
-#include <direct.h>
-#endif
-
 #include <Batch_NotYetImplementedException.hxx>
 #include <Batch_Constants.hxx>
 #include <Batch_Utils.hxx>
@@ -167,12 +163,7 @@ namespace Batch {
       Couple inputFile = cpt;
 
       // Get absolute paths
-      char * buf = 
-#ifdef WIN32
-      _getcwd(NULL, 0);
-#else
-       getcwd(NULL, 0);
-#endif
+      char * buf = getcwd(NULL, 0);
       string cwd = buf;
       free(buf);
 
@@ -350,12 +341,7 @@ namespace Batch {
     Versatile::const_iterator Vit;
 
     // Create local result directory
-    char * buf = 
-#ifdef WIN32
-     _getcwd(NULL, 0);
-#else
-     getcwd(NULL, 0);
-#endif
+    char * buf = getcwd(NULL, 0);
     string cwd = buf;
     free(buf);
     string absdir = (Utils::isAbsolutePath(directory))? directory : cwd + "/" + directory;