Update of /cvsroot/octaviz/octaviz/Common
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26051/Common
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/Common/CMakeLists.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- CMakeLists.txt 8 Oct 2007 06:25:39 -0000 1.8
+++ CMakeLists.txt 11 Oct 2007 07:34:53 -0000 1.9
@@ -3,11 +3,9 @@
ADD_LIBRARY( octaviz SHARED octaviz.cc )
OCTAVE_WRAP_VTK(Common "${KIT_WRAP_DEPS}")
-EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p OCTINCLUDEDIR" OUTPUT_VARIABLE OCT_INC_DIR)
-EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p OCTLIBDIR" OUTPUT_VARIABLE OCT_LIB_DIR)
-INCLUDE_DIRECTORIES(${OCT_INC_DIR} "${OCT_INC_DIR}/octave" )
+INCLUDE_DIRECTORIES(${OCTINCLUDEDIR} "${OCTINCLUDEDIR}/octave" )
LINK_LIBRARIES(octinterp octave cruft vtkCommon)
-LINK_DIRECTORIES(${OCT_LIB_DIR})
+LINK_DIRECTORIES(${OCTLIBDIR})
ADD_CUSTOM_COMMAND( OUTPUT vtk_init.oct COMMAND mkoctfile ${oct_flags} ${oct_link_flags} -Wno-deprecated -loctaviz -L. vtk_init.cc )
ADD_CUSTOM_COMMAND( OUTPUT vtkInitializeInteractor.oct COMMAND mkoctfile ${oct_flags} ${oct_link_flags} -Wno-deprecated -loctaviz -L. vtkInitializeInteractor.cc)
@@ -19,15 +17,11 @@
#ADD_CUSTOM_TARGET(vtkWindow.oct ALL mkoctfile ${oct_flags} ${oct_link_flags} vtkWindow.cc)
-# Get octave lib install directory
-EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p OCTLIBDIR" OUTPUT_VARIABLE OCT_LIB_DIR)
INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz vtkInitializeInteractor.oct vtk_init.oct vtkRaiseWindow.oct vtk_get_pointer.oct vtk_print_ref_table.oct)
INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz ${all_oct})
#MESSAGE(${all_oct})
-# Get octave lib install directory
-EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p OCTLIBDIR" OUTPUT_VARIABLE OCT_LIB_DIR)
# Remove prefix from octave lib install dir
-STRING(REGEX REPLACE "${CMAKE_INSTALL_PREFIX}" "" OUT_MTCH ${OCT_LIB_DIR})
+STRING(REGEX REPLACE "${CMAKE_INSTALL_PREFIX}" "" OUT_MTCH ${OCTLIBDIR})
INSTALL_TARGETS(${OUT_MTCH} octaviz)
|
