[Octaviz-cvsupdate] octaviz CMakeLists.txt,1.16,1.17

[Thomas W. <tho...@us...>]

Update of /cvsroot/octaviz/octaviz
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19770

Modified Files:
	CMakeLists.txt 
Log Message:
Use EXECUTE_PROCESS instead of EXEC_PROGRAM
This makes it possible to strip empty arguments (XTRA_CXXFLAGS), which
otherwise result in compilation problems
http://lists.alioth.debian.org/pipermail/pkg-octave-devel/2008-January/002981.html


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/octaviz/octaviz/CMakeLists.txt,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- CMakeLists.txt	11 Jan 2008 15:10:22 -0000	1.16
+++ CMakeLists.txt	13 Jan 2008 13:18:08 -0000	1.17
@@ -52,24 +52,33 @@
   MESSAGE(FATAL_ERROR "Octave is required, but octave-config was not found.  Please install Octave and rerun cmake.")
 ENDIF(NOT OCTAVE_CONFIG)
 
-EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "--oct-site-dir" OUTPUT_VARIABLE OCT_SITE_DIR)
-EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "--m-site-dir" OUTPUT_VARIABLE M_SITE_DIR)
-EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p OCTINCLUDEDIR" OUTPUT_VARIABLE OCTINCLUDEDIR)
-EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p OCTLIBDIR" OUTPUT_VARIABLE OCTLIBDIR)
+EXECUTE_PROCESS(COMMAND ${OCTAVE_CONFIG} --oct-site-dir 
+  OUTPUT_VARIABLE OCT_SITE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+EXECUTE_PROCESS(COMMAND ${OCTAVE_CONFIG} --m-site-dir 
+  OUTPUT_VARIABLE M_SITE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+EXECUTE_PROCESS(COMMAND ${OCTAVE_CONFIG} -p OCTINCLUDEDIR 
+  OUTPUT_VARIABLE OCTINCLUDEDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+EXECUTE_PROCESS(COMMAND ${OCTAVE_CONFIG} -p OCTLIBDIR 
+  OUTPUT_VARIABLE OCTLIBDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
     
 
 FIND_PROGRAM(MKOCTFILE mkoctfile)
 IF(NOT MKOCTFILE)
   MESSAGE(FATAL_ERROR "mkoctfile was not found. If you installed Octave from a distribution package, please check if there are any devel packages for it (normally named '-dev' or '-devel')")
 ENDIF(NOT MKOCTFILE)
-EXEC_PROGRAM(${MKOCTFILE} ARGS "-p ALL_CXXFLAGS" OUTPUT_VARIABLE ALL_CXXFLAGS)
-EXEC_PROGRAM(${MKOCTFILE} ARGS "-p XTRA_CXXFLAGS" OUTPUT_VARIABLE XTRA_CXXFLAGS)
+EXECUTE_PROCESS(COMMAND ${MKOCTFILE} -p ALL_CXXFLAGS 
+  OUTPUT_VARIABLE ALL_CXXFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+EXECUTE_PROCESS(COMMAND ${MKOCTFILE} -p XTRA_CXXFLAGS 
+  OUTPUT_VARIABLE XTRA_CXXFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
 # -mieee-fp
-EXEC_PROGRAM(${MKOCTFILE} ARGS "-p CXXPICFLAG" OUTPUT_VARIABLE CXXPICFLAG)
+EXECUTE_PROCESS(COMMAND ${MKOCTFILE} -p CXXPICFLAG 
+  OUTPUT_VARIABLE CXXPICFLAG OUTPUT_STRIP_TRAILING_WHITESPACE)
 # -fPIC
-EXEC_PROGRAM(${MKOCTFILE} ARGS "-p CXXFLAGS" OUTPUT_VARIABLE CXXFLAGS)
+EXECUTE_PROCESS(COMMAND ${MKOCTFILE} -p CXXFLAGS 
+  OUTPUT_VARIABLE CXXFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
 # -O2
-EXEC_PROGRAM(${MKOCTFILE} ARGS "-p CXX" OUTPUT_VARIABLE OCTAVE_CXX)
+EXECUTE_PROCESS(COMMAND ${MKOCTFILE} -p CXX 
+  OUTPUT_VARIABLE OCTAVE_CXX OUTPUT_STRIP_TRAILING_WHITESPACE)
 SET(CMAKE_CXX_COMPILER ${OCTAVE_CXX})