From: Jonathan S. <jjs...@us...> - 2010-02-03 16:03:05
|
Update of /cvsroot/octaviz/octaviz In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21645 Modified Files: CMakeLists.txt Log Message: attempt to get octaviz working with vtk-5.2, courtesy of Andreas Potschka Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/CMakeLists.txt,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- CMakeLists.txt 14 Mar 2008 14:12:17 -0000 1.19 +++ CMakeLists.txt 3 Feb 2010 16:02:55 -0000 1.20 @@ -3,6 +3,8 @@ PROJECT(OCTAVIZ) +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) + ## added from cmake FAQ, JJS 3/29/05; also needs the file cmake_uninstall.cmake.in ## currently not working (vtkGetDataRoot.m is showing up in the install_manifest.txt file twice) ## see the README for alternate uninstall method, JJS 3/14/08 @@ -34,6 +36,11 @@ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} /usr/local/lib/vtk /usr/lib/vtk) +FIND_PACKAGE(TCL) +IF(NOT TCL_FOUND) + MESSAGE(FATAL_ERROR "TCL is required. Please set TCL_DIR.") +ENDIF(NOT TCL_FOUND) + FIND_PACKAGE(VTK) IF(NOT VTK_FOUND) MESSAGE(FATAL_ERROR "VTK is required. Please set VTK_DIR.") @@ -123,7 +130,7 @@ # There are some header files in the Common/ directory that we need # Add binary directory before source directory for the precompiled headers - SET(INCLUDE_FLAGS -I${VTK_${ukit}_HEADER_DIR} -I${CMAKE_BINARY_DIR}/Common -I${CMAKE_SOURCE_DIR}/Common) + SET(INCLUDE_FLAGS -I${TCL_INCLUDE_PATH} -I${VTK_${ukit}_HEADER_DIR} -I${CMAKE_BINARY_DIR}/Common -I${CMAKE_SOURCE_DIR}/Common) SET(LINK_FLAGS -L${X11_LIBRARY_DIR} -lX11 -lXt -L${VTK_LIBRARY_DIRS} -lvtkCommon -lvtk${kit} -lvtkFiltering -lvtkGraphics -L${CMAKE_BINARY_DIR}/Common -loctaviz) |