Update of /cvsroot/octaviz/octaviz/Scripts
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26051/Scripts
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/Scripts/CMakeLists.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CMakeLists.txt 17 Jan 2007 21:18:53 -0000 1.3
+++ CMakeLists.txt 11 Oct 2007 07:34:53 -0000 1.4
@@ -1,19 +1,8 @@
-EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "--m-site-dir" OUTPUT_VARIABLE M_INST_DIR_EXEC)
-# Remove prefix from scripts install dir
-STRING(REGEX REPLACE "${CMAKE_INSTALL_PREFIX}" "" M_INST_DIR ${M_INST_DIR_EXEC})
-
# Insert VTK_DATA_ROOT given to cmake into vtkGetDataRoot.m
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/vtkGetDataRoot.m
${CMAKE_CURRENT_BINARY_DIR}/vtkGetDataRoot.m)
-EXEC_PROGRAM("pwd" OUTPUT_VARIABLE CURRENT_DIR_EXEC)
-IF(CURRENT_DIR_EXEC MATCHES "Scripts")
- SET(CURR_DIR "")
-ELSE(CURRENT_DIR_EXEC MATCHES "Scripts")
- SET(CURR_DIR "Scripts")
-ENDIF(CURRENT_DIR_EXEC MATCHES "Scripts")
-
EXEC_PROGRAM("ls" ${CURR_DIR} ARGS "*.m" OUTPUT_VARIABLE M_SCRIPTS_EXEC)
STRING(REGEX MATCHALL "[^\n]+" M_SCRIPTS ${M_SCRIPTS_EXEC})
-INSTALL_PROGRAMS(${M_INST_DIR}/octaviz ${M_SCRIPTS})
+INSTALL_PROGRAMS(${OCTAVIZ_M_DIR} ${M_SCRIPTS})
|
