diff options
| author | Jennifer Leech <jenn@lindenlab.com> | 2008-07-03 18:15:16 +0000 |
|---|---|---|
| committer | Jennifer Leech <jenn@lindenlab.com> | 2008-07-03 18:15:16 +0000 |
| commit | e6dcb705a557e25b5cc0c132b60de42ea0acf440 (patch) | |
| tree | 656fa13002d623143824df66d33bcf5a3cbe5c17 /indra | |
| parent | 1a954d38cd6d85310c196886fe10a7eec47afd2c (diff) | |
Fix for windows + develop.py: Use pscp on windows instead of scp.
This also requires a putty session to be created, same as we do for svn.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/FindSCP.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/cmake/FindSCP.cmake b/indra/cmake/FindSCP.cmake index 9c9b61cd66..ea02102908 100644 --- a/indra/cmake/FindSCP.cmake +++ b/indra/cmake/FindSCP.cmake @@ -12,7 +12,11 @@ # SCP_BATCH_FLAG - how to put scp/pscp into batch mode SET(SCP_EXECUTABLE) -FIND_PROGRAM(SCP_EXECUTABLE NAMES scp scp.exe pscp pscp.exe) +IF (WINDOWS) + FIND_PROGRAM(SCP_EXECUTABLE NAMES pscp pscp.exe) +ELSE (WINDOWS) + FIND_PROGRAM(SCP_EXECUTABLE NAMES scp scp.exe) +ENDIF (WINDOWS) IF (SCP_EXECUTABLE) SET(SCP_FOUND ON) |