From: barate <barate>
Date: Fri, 30 Mar 2012 08:09:17 +0000 (+0000)
Subject: Deactivate Vishnu client compilation on Win32 platform (Vishnu not available for... 
X-Git-Tag: V1_5_0b1~4
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=6c2c984947f48a63dc6034d3aa33273208826c79;p=tools%2Flibbatch.git

Deactivate Vishnu client compilation on Win32 platform (Vishnu not available for Windows)
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b93a6b5..e88e974 100644
--- 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 df14196..7ac2ee5 100644
--- 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;