[bos #32518][EDF] (2022-T3)

[tools/libbatch.git] / CMakeModules / libbatchMacros.cmake

diff --git a/CMakeModules/libbatchMacros.cmake b/CMakeModules/libbatchMacros.cmake
index 4d9846b76b75796c5f1a39b03f7ed27396aa6a0d..a8daa4f2eeab5faf93ab73e8472277ca994dd309 100644 (file)
--- a/CMakeModules/libbatchMacros.cmake
+++ b/CMakeModules/libbatchMacros.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -60,19 +60,16 @@ MACRO(LIBBATCH_FIND_ALL_LOCAL_COMMANDS)
   FIND_LOCAL_COMMAND_WIN32_DEF(LIBBATCH_RM_COMMAND rm del)
   FIND_LOCAL_COMMAND(LIBBATCH_SH_COMMAND sh cmd.exe)
   FIND_LOCAL_COMMAND_WIN32_DEF(LIBBATCH_CP_COMMAND cp copy)
-  FIND_LOCAL_COMMAND_WIN32_DEF(LIBBATCH_MKDIR_COMMAND mkdir mkdir)
+  FIND_LOCAL_COMMAND_WIN32_DEF(LIBBATCH_MKDIR_COMMAND mkdir md)
   FIND_LOCAL_COMMAND(LIBBATCH_RSH_COMMAND rsh rsh)
   FIND_LOCAL_COMMAND(LIBBATCH_RCP_COMMAND rcp rcp)
   FIND_LOCAL_COMMAND(LIBBATCH_SSH_COMMAND ssh plink)
   FIND_LOCAL_COMMAND(LIBBATCH_SCP_COMMAND scp pscp)
+  FIND_LOCAL_COMMAND(LIBBATCH_RSYNC_COMMAND rsync pscp)
 
-  EVAL (HAS_SH LIBBATCH_SH_COMMAND AND LIBBATCH_CP_COMMAND AND LIBBATCH_RM_COMMAND AND LIBBATCH_MKDIR_COMMAND)
-  EVAL (HAS_RSH LIBBATCH_RSH_COMMAND AND LIBBATCH_RCP_COMMAND)
-  EVAL (HAS_SSH LIBBATCH_SSH_COMMAND AND LIBBATCH_SCP_COMMAND)
-  
   # Mark shell commands as advanced options
   # and assign the names without the LIBBATCH_ in front:
-  SET (_cmds "RM;SH;CP;MKDIR;RSH;RCP;SSH;SCP")
+  SET (_cmds "RM;SH;CP;MKDIR;RSH;RCP;SSH;SCP;RSYNC")
   FOREACH(_cmd ${_cmds})    
     MARK_AS_ADVANCED(LIBBATCH_${_cmd}_COMMAND)
     SET(${_cmd}_COMMAND ${LIBBATCH_${_cmd}_COMMAND})