[Plplot-cvs] plplot/cmake/modules FindSWIG.cmake,1.2,1.3

[Alan W. I. <ai...@us...>]

Update of /cvsroot/plplot/plplot/cmake/modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15921

Modified Files:
	FindSWIG.cmake 
Log Message:
Fix improper nesting of if statements.

Apply a simpler fix for stderr versus stdout question.


Index: FindSWIG.cmake
===================================================================
RCS file: /cvsroot/plplot/plplot/cmake/modules/FindSWIG.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FindSWIG.cmake	30 Jan 2007 09:49:13 -0000	1.2
+++ FindSWIG.cmake	30 Jan 2007 19:46:28 -0000	1.3
@@ -32,22 +32,17 @@
       SET(SWIG_USE_FILE ${CMAKE_ROOT}/Modules/UseSWIG.cmake)
       EXECUTE_PROCESS(COMMAND ${SWIG_EXECUTABLE} -version
 	OUTPUT_VARIABLE SWIG_version_output
-	ERROR_VARIABLE SWIG_version_error
+	ERROR_VARIABLE SWIG_version_output
 	RESULT_VARIABLE SWIG_version_result)
       IF(SWIG_version_result)
         MESSAGE(SEND_ERROR "Command \"${SWIG_EXECUTABLE} -version\" failed with output:\n${SWIG_version_error}")
       ELSE(SWIG_version_result)
-        IF(SWIG_version_output STREQUAL "")
-        STRING(REGEX REPLACE ".*SWIG Version[^0-9.]*\([0-9.]+\).*" "\\1"
-	  SWIG_version_output "${SWIG_version_error}")
-        ELSE(SWIG_version_output STREQUAL "")
         STRING(REGEX REPLACE ".*SWIG Version[^0-9.]*\([0-9.]+\).*" "\\1"
 	  SWIG_version_output "${SWIG_version_output}")
-        ENDIF(SWIG_version_output STREQUAL "")
         SET(SWIG_VERSION ${SWIG_version_output} CACHE STRING "Swig version" FORCE)
-      ENDIF(SWIG_swiglib_result)
+      ENDIF(SWIG_version_result)
     ENDIF(SWIG_DIR)
-  ENDIF(SWIG_version_result)
+  ENDIF(SWIG_swiglib_result)
 ENDIF(SWIG_EXECUTABLE)
 
 IF(NOT SWIG_FOUND)