From 6c2c984947f48a63dc6034d3aa33273208826c79 Mon Sep 17 00:00:00 2001 From: barate Date: Fri, 30 Mar 2012 08:09:17 +0000 Subject: [PATCH] Deactivate Vishnu client compilation on Win32 platform (Vishnu not available for Windows) --- src/CMakeLists.txt | 6 +++++- src/Vishnu/Batch_BatchManager_eVishnu.cxx | 18 ++---------------- 2 files changed, 7 insertions(+), 17 deletions(-) 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 #include -#ifdef WIN32 -#include -#endif - #include #include #include @@ -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; -- 2.30.2