[Octaviz-cvsupdate] octaviz CMakeLists.txt,1.11,1.12

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

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

Modified Files:
	CMakeLists.txt 
Log Message:
Unify configuration calls to octave-config and mkoctfile
Variables are named like the variables in octave-config and
mkoctfile calls, respectively.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/octaviz/octaviz/CMakeLists.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- CMakeLists.txt	8 Oct 2007 06:25:39 -0000	1.11
+++ CMakeLists.txt	11 Oct 2007 07:34:53 -0000	1.12
@@ -35,25 +35,31 @@
 ENDIF(NOT X11_FOUND)
 LINK_LIBRARIES(${X11_LIBRARIES} Xt)
 
-# find octave-config
+# find octave-config and get variables from it
 FIND_PROGRAM(OCTAVE_CONFIG octave-config)
 IF(NOT OCTAVE_CONFIG)
-  MESSAGE(FATAL_ERROR "Octave is required.  Please install Octave and rerun cmake.")
+  MESSAGE(FATAL_ERROR "Octave is required, but octave-config was not found.  Please install Octave and rerun cmake.")
 ENDIF(NOT OCTAVE_CONFIG)
 
-# Set prefix from octave prefix
-EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p PREFIX" OUTPUT_VARIABLE OCT_PREFIX_EXEC)
+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)
+    
 
-# check to see if OCT_PREFIX_EXEC is unset
-# unset variables match exactly the name of the variable
-IF(OCT_PREFIX_EXEC MATCHES "^OCT_PREFIX_EXEC$")
-ELSE(OCT_PREFIX_EXEC MATCHES "^OCT_PREFIX_EXEC$")
-  # if OCT_PREFIX_EXEC has a value then cache the value
-  # so that OCT_PREFIX can be seen in all sub directories of
-  # the project
-  SET(OCT_PREFIX ${OCT_PREFIX_EXEC} CACHE INTERNAL "" FORCE)
-ENDIF(OCT_PREFIX_EXEC MATCHES "^OCT_PREFIX_EXEC$")
-SET(CMAKE_INSTALL_PREFIX ${OCT_PREFIX} CACHE PATH "Specifies the directory where .oct files will be installed." FORCE)
+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)
+
+# Make the values accessible from other CMakeLists.txt files
+# Also, this allows packagers to override the default values 
+SET(OCTAVIZ_OCT_DIR ${OCT_SITE_DIR}/octaviz CACHE PATH ".oct files from Octaviz")
+SET(OCTAVIZ_M_DIR ${M_SITE_DIR}/octaviz CACHE PATH ".m files from Octaviz")
+SET(OCTAVIZ_EXAMPLES_DIR ${OCTAVIZ_M_DIR}/Examples CACHE PATH "Example .m files from Octaviz")
+SET(OCTAVIZ_SHARED_DIR ${OCTLIBDIR} CACHE PATH "shared libraries from Octaviz")
+SET(ALL_CXXFLAGS ${ALL_CXXFLAGS} CACHE STRING "ALL_CXXFLAGS from mkoctfile")
 
 # Build the vtkOctave wrapping utility first.
 ADD_SUBDIRECTORY(Wrapping)