Update of /cvsroot/octaviz/octaviz
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20916
Modified Files:
CMakeLists.txt
Log Message:
use MKOCTFILE throughout
Drop the commented symbolic link code; we have PKG_ADD and autoload()
(implementing them is on the agenda, but the symbolic link clutters the
CMakeLists.txt)
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/octaviz/octaviz/CMakeLists.txt,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- CMakeLists.txt 11 Oct 2007 16:18:14 -0000 1.13
+++ CMakeLists.txt 12 Oct 2007 10:09:32 -0000 1.14
@@ -64,18 +64,9 @@
# Build the vtkOctave wrapping utility first.
ADD_SUBDIRECTORY(Wrapping)
-# Hack that creates symbolic links to functions
-#ADD_CUSTOM_TARGET(create_links echo "Symbolic links created.")
-#FOREACH(kit ${vtk_kits})
-# ADD_CUSTOM_TARGET(create_links_${kit} cd ${kit}\; ${CMAKE_MAKE_PROGRAM} create_links)
-# ADD_DEPENDENCIES(create_links create_links_${kit})
-#ENDFOREACH(kit)
-
# Macro to create Octave wrapper functions
MACRO(OCTAVE_WRAP_VTK kit deps)
STRING(TOUPPER ${kit} ukit)
- # Hack for symbolic links
- # ADD_CUSTOM_TARGET(create_links echo "Symlinked ${kit}")
INCLUDE(${VTK_KITS_DIR}/vtk${kit}Kit.cmake)
@@ -120,8 +111,7 @@
# Which flags will mkoctfile use?
SET (PCHFLAGS "")
- EXEC_PROGRAM("mkoctfile" ARGS "-p ALL_CXXFLAGS" OUTPUT_VARIABLE MKOCT_FLAGS_EXEC)
- STRING(REGEX MATCHALL "[^ ]+" MKOCT_FLAGS_LIST ${MKOCT_FLAGS_EXEC})
+ STRING(REGEX MATCHALL "[^ ]+" MKOCT_FLAGS_LIST ${ALL_CXXFLAGS})
FOREACH (flag ${MKOCT_FLAGS_LIST})
SET (PCHFLAGS ${PCHFLAGS} ${flag})
ENDFOREACH (flag ${MKOCT_FLAGS_LIST})
@@ -131,9 +121,8 @@
ADD_CUSTOM_TARGET(OctavizCommon.h.gch ALL ${CXX_COMPILER_PCH} "-c" ${PCHFLAGS} ${oct_flags} ../Common/OctavizCommon.h)
ENDIF(USE_PREC_HEADERS)
- EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "--oct-site-dir" OUTPUT_VARIABLE OCT_INST_DIR_EXEC)
# Remove prefix from oct install dir
- STRING(REGEX REPLACE "${CMAKE_INSTALL_PREFIX}" "" OCT_INST_DIR ${OCT_INST_DIR_EXEC})
+ STRING(REGEX REPLACE "${CMAKE_INSTALL_PREFIX}" "" OCT_INST_DIR ${OCT_SITE_DIR})
SET ( all_oct "" )
FOREACH(class ${VTK_${ukit}_CLASSES})
@@ -141,14 +130,11 @@
SET(full_name "${VTK_${ukit}_HEADER_DIR}/${class}.h")
IF(NOT VTK_CLASS_WRAP_EXCLUDE_${class})
ADD_CUSTOM_COMMAND( OUTPUT ${class}.cc COMMAND ../Wrapping/vtkWrapOctave ${full_name} ../Wrapping/hints 1 ${class}.cc )
- ADD_CUSTOM_COMMAND( OUTPUT ${class}.oct COMMAND mkoctfile ${oct_flags} -Wno-deprecated ${oct_link_flags} -L../Common -loctaviz ${class}.cc DEPENDS ${class}.cc )
+ ADD_CUSTOM_COMMAND( OUTPUT ${class}.oct COMMAND ${MKOCTFILE} ${oct_flags} -Wno-deprecated ${oct_link_flags} -L../Common -loctaviz ${class}.cc DEPENDS ${class}.cc )
SET ( all_oct ${all_oct} ${class}.oct )
# ADD_CUSTOM_TARGET(${class}.cc ALL ../Wrapping/vtkWrapOctave ${full_name} ../Wrapping/hints 1 ${class}.cc)
# ADD_CUSTOM_TARGET(${class}.oct ALL sleep 0 \; mkoctfile ${oct_flags} ${oct_link_flags} -L../Common -loctaviz ${class}.cc)
# ADD_DEPENDENCIES(vtk${kit}.cc ${class}.cc)
- # Hack for symbolic links
- # ADD_CUSTOM_TARGET(${class}_link echo Symlinking ${class}\; ln -s ${CMAKE_INSTALL_PREFIX}${OCT_INST_DIR}/octaviz/vtk${kit}.oct ${CMAKE_INSTALL_PREFIX}${OCT_INST_DIR}/octaviz/${class}.oct)
- # ADD_DEPENDENCIES(create_links ${class}_link)
ENDIF(NOT VTK_CLASS_WRAP_EXCLUDE_${class})
ENDFOREACH(class)
ENDMACRO(OCTAVE_WRAP_VTK)
|
