Commit 27fb54d3 authored by Brad King's avatar Brad King
Browse files

BUG: Cannot use Win32 implementation for cygwin processes because then cygwin...

BUG: Cannot use Win32 implementation for cygwin processes because then cygwin paths to executables like /usr/bin/ls are not found.
parent 0d9fbf21
...@@ -352,17 +352,17 @@ SET(KWSYS_CXX_SRCS) ...@@ -352,17 +352,17 @@ SET(KWSYS_CXX_SRCS)
# Add the proper sources for this platform's Process implementation. # Add the proper sources for this platform's Process implementation.
IF(KWSYS_USE_Process) IF(KWSYS_USE_Process)
IF(WIN32) IF(NOT UNIX)
# Use the Windows implementation. We need the encoded forwarding executable. # Use the Windows implementation. We need the encoded forwarding executable.
SET(KWSYS_C_SRCS ${KWSYS_C_SRCS} ProcessWin32.c SET(KWSYS_C_SRCS ${KWSYS_C_SRCS} ProcessWin32.c
${PROJECT_BINARY_DIR}/${KWSYS_NAMESPACE}ProcessFwd9xEnc.c) ${PROJECT_BINARY_DIR}/${KWSYS_NAMESPACE}ProcessFwd9xEnc.c)
SET_SOURCE_FILES_PROPERTIES( SET_SOURCE_FILES_PROPERTIES(
${PROJECT_BINARY_DIR}/${KWSYS_NAMESPACE}ProcessFwd9xEnc.c ${PROJECT_BINARY_DIR}/${KWSYS_NAMESPACE}ProcessFwd9xEnc.c
PROPERTIES GENERATED 1) PROPERTIES GENERATED 1)
ELSE(WIN32) ELSE(NOT UNIX)
# Use the UNIX implementation. # Use the UNIX implementation.
SET(KWSYS_C_SRCS ${KWSYS_C_SRCS} ProcessUNIX.c) SET(KWSYS_C_SRCS ${KWSYS_C_SRCS} ProcessUNIX.c)
ENDIF(WIN32) ENDIF(NOT UNIX)
ENDIF(KWSYS_USE_Process) ENDIF(KWSYS_USE_Process)
# Add sources for Base64 encoding. # Add sources for Base64 encoding.
...@@ -444,7 +444,7 @@ ADD_DEFINITIONS("-DKWSYS_NAMESPACE=${KWSYS_NAMESPACE}") ...@@ -444,7 +444,7 @@ ADD_DEFINITIONS("-DKWSYS_NAMESPACE=${KWSYS_NAMESPACE}")
# file and build it into the library. Win9x platforms reproduce the # file and build it into the library. Win9x platforms reproduce the
# executable into a temporary directory when it is needed. # executable into a temporary directory when it is needed.
IF(KWSYS_USE_Process) IF(KWSYS_USE_Process)
IF(WIN32) IF(NOT UNIX)
# Build the forwarding executable itself and a program that will # Build the forwarding executable itself and a program that will
# encode it into a C file. # encode it into a C file.
ADD_EXECUTABLE(${KWSYS_NAMESPACE}ProcessFwd9x ProcessFwd9x.c) ADD_EXECUTABLE(${KWSYS_NAMESPACE}ProcessFwd9x ProcessFwd9x.c)
...@@ -485,7 +485,7 @@ IF(KWSYS_USE_Process) ...@@ -485,7 +485,7 @@ IF(KWSYS_USE_Process)
# Make sure build occurs in proper order. # Make sure build occurs in proper order.
ADD_DEPENDENCIES(${KWSYS_NAMESPACE} ${KWSYS_NAMESPACE}ProcessFwd9x ADD_DEPENDENCIES(${KWSYS_NAMESPACE} ${KWSYS_NAMESPACE}ProcessFwd9x
${KWSYS_NAMESPACE}EncodeExecutable) ${KWSYS_NAMESPACE}EncodeExecutable)
ENDIF(WIN32) ENDIF(NOT UNIX)
ENDIF(KWSYS_USE_Process) ENDIF(KWSYS_USE_Process)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment