Commit ddc1f04a authored by pieper's avatar pieper
Browse files

COMP: change from TEEM to Teem for compatibility with current svn trunk of teem

git-svn-id: http://svn.slicer.org/Slicer4/trunk@7799 3bd1e089-480b-0410-8dfb-8563597acbee
parent fa2b1b86
......@@ -30,7 +30,7 @@ if(BUILD_SHARED_LIBS)
set(Slicer3_FORWARD_DIR_INSTALL "${Slicer3_EXE_INSTALL}")
if(WIN32)
set(Slicer3_FORWARD_PATH_BUILD
"\"${Slicer3_FORWARD_DIR_BUILD}\" CONFIG_DIR_POST,\"${VTK_DIR}/bin\" CONFIG_DIR_POST,\"${KWWidgets_RUNTIME_DIRS}\" CONFIG_DIR_POST,\"${ITK_DIR}/bin\" CONFIG_DIR_POST,\"${TEEM_DIR}/bin\" CONFIG_DIR_POST,\"${TCL_DIR}/bin\",\"${INCR_TCL_LIBRARY_PATH}\",\"${INCR_TK_LIBRARY_PATH}\"")
"\"${Slicer3_FORWARD_DIR_BUILD}\" CONFIG_DIR_POST,\"${VTK_DIR}/bin\" CONFIG_DIR_POST,\"${KWWidgets_RUNTIME_DIRS}\" CONFIG_DIR_POST,\"${ITK_DIR}/bin\" CONFIG_DIR_POST,\"${Teem_DIR}/bin\" CONFIG_DIR_POST,\"${TCL_DIR}/bin\",\"${INCR_TCL_LIBRARY_PATH}\",\"${INCR_TK_LIBRARY_PATH}\"")
set(Slicer3_FORWARD_PATH_INSTALL
"\"../lib/TclTk/bin\",\"../lib/TclTk/lib/itcl${INCR_TCL_VERSION_DOT}\",\"../lib/TclTk/lib/itk${INCR_TCL_VERSION_DOT}\"")
if(Slicer3_BUILD_MODULES)
......@@ -43,9 +43,9 @@ if(BUILD_SHARED_LIBS)
endif(Slicer3_BUILD_CLI)
else(WIN32)
set(Slicer3_FORWARD_PATH_BUILD
"\"${Slicer3_FORWARD_DIR_BUILD}\",\"${VTK_DIR}/bin\",\"${KWWidgets_RUNTIME_DIRS}\",\"${ITK_DIR}/bin\",\"${TEEM_DIR}/bin\",\"${TCL_DIR}/bin\",\"${INCR_TCL_LIBRARY_PATH}\",\"${INCR_TK_LIBRARY_PATH}\",\"${OPENGL_gl_LIBRARY_PATH}\"")
"\"${Slicer3_FORWARD_DIR_BUILD}\",\"${VTK_DIR}/bin\",\"${KWWidgets_RUNTIME_DIRS}\",\"${ITK_DIR}/bin\",\"${Teem_DIR}/bin\",\"${TCL_DIR}/bin\",\"${INCR_TCL_LIBRARY_PATH}\",\"${INCR_TK_LIBRARY_PATH}\",\"${OPENGL_gl_LIBRARY_PATH}\"")
set(Slicer3_FORWARD_PATH_INSTALL
"\"../${Slicer3_INSTALL_LIB_DIR}\",\"../lib/vtk-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}\",\"../lib/KWWidgets\",\"../lib/InsightToolkit\",\"../lib/TEEM-${TEEM_VERSION_MAJOR}.${TEEM_VERSION_MINOR}\",\"../lib/TclTk/lib\",\"../lib/TclTk/lib/itcl${INCR_TCL_VERSION_DOT}\",\"../lib/TclTk/lib/itk${INCR_TCL_VERSION_DOT}\",\"../lib/FreeSurfer\",\"../lib/IGT\",\"../lib/ITKCommandIO\",\"../lib/LoadableModule\",\"../lib/MGHImageIO\",\"../lib/MRML\",\"../lib/ModuleDescriptionParser\",\"../lib/MRMLIDImageIO\",\"../lib/Qdec\",\"../lib/RemoteIO\",\"../lib/SlicerIO\",\"../lib/tclap\",\"../lib/vtkITK\",\"../lib/vtkTeem\"")
"\"../${Slicer3_INSTALL_LIB_DIR}\",\"../lib/vtk-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}\",\"../lib/KWWidgets\",\"../lib/InsightToolkit\",\"../lib/Teem-${Teem_VERSION_MAJOR}.${Teem_VERSION_MINOR}\",\"../lib/TclTk/lib\",\"../lib/TclTk/lib/itcl${INCR_TCL_VERSION_DOT}\",\"../lib/TclTk/lib/itk${INCR_TCL_VERSION_DOT}\",\"../lib/FreeSurfer\",\"../lib/IGT\",\"../lib/ITKCommandIO\",\"../lib/LoadableModule\",\"../lib/MGHImageIO\",\"../lib/MRML\",\"../lib/ModuleDescriptionParser\",\"../lib/MRMLIDImageIO\",\"../lib/Qdec\",\"../lib/RemoteIO\",\"../lib/SlicerIO\",\"../lib/tclap\",\"../lib/vtkITK\",\"../lib/vtkTeem\"")
if(Slicer3_BUILD_MODULES)
set(Slicer3_FORWARD_PATH_BUILD
"${Slicer3_FORWARD_PATH_BUILD},\"${Slicer3_HOME}/${Slicer3_INSTALL_MODULES_BIN_DIR}\"")
......
......@@ -116,7 +116,7 @@ Slicer3_USE_MIDAS:BOOL=@Slicer3_USE_MIDAS@
Slicer3_USE_NAVITRACK:BOOL=@Slicer3_USE_NAVITRACK@
Slicer3_USE_PYTHON:BOOL=@Slicer3_USE_PYTHON@
TEEM_DIR:PATH=@TEEM_DIR@
Teem_DIR:PATH=@Teem_DIR@
SLICERLIBCURL_DIR:PATH=@SLICERLIBCURL_DIR@
ITK_DIR:PATH=@ITK_DIR@
KWWidgets_DIR:PATH=@KWWidgets_DIR@
......
......@@ -129,7 +129,7 @@ endif(Slicer3_BUILD_TESTING)
set(SKIP_KWWidgets_BUILD_SETTINGS_FILE 1)
set(SKIP_VTK_BUILD_SETTINGS_FILE 1)
set(SKIP_ITK_BUILD_SETTINGS_FILE 1)
set(SKIP_TEEM_BUILD_SETTINGS_FILE 1)
set(SKIP_Teem_BUILD_SETTINGS_FILE 1)
## Python
option(Slicer3_USE_PYTHON "Integrate a python interpreter into Slicer." OFF)
......@@ -152,11 +152,11 @@ endif(NOT KWWidgets_FOUND)
include(${KWWidgets_USE_FILE})
## Teem
find_package(TEEM REQUIRED)
if(NOT TEEM_FOUND)
message(FATAL_ERROR "Need TEEM to build")
endif(NOT TEEM_FOUND)
include(${TEEM_USE_FILE})
find_package(Teem REQUIRED)
if(NOT Teem_FOUND)
message(FATAL_ERROR "Need Teem to build")
endif(NOT Teem_FOUND)
include(${Teem_USE_FILE})
## SlicerLibCurl
find_package(SLICERLIBCURL REQUIRED)
......@@ -223,7 +223,7 @@ set(INCR_TCL_VERSION "${INCR_TCL_MAJOR_VERSION}${INCR_TCL_MINOR_VERSION}")
#
include("${KWWidgets_CMAKE_DIR}/KWWidgetsPathsMacros.cmake")
set(extra_dirs
"${TEEM_DIR}/bin"
"${Teem_DIR}/bin"
"${BatchMake_DIR}/bin"
"${Slicer3_HOME}/${Slicer3_INSTALL_PLUGINS_BIN_DIR}"
"${Slicer3_HOME}/${Slicer3_INSTALL_PLUGINS_LIB_DIR}"
......
......@@ -33,7 +33,7 @@ SET(Slicer3_Base_LIBRARY_DIRS_CONFIG ${Slicer3_BINARY_DIR}/bin)
SET(ITK_DIR_CONFIG ${ITK_DIR})
SET(VTK_DIR_CONFIG ${VTK_DIR})
SET(KWWidgets_DIR_CONFIG ${KWWidgets_DIR})
SET(TEEM_DIR_CONFIG ${TEEM_DIR})
SET(Teem_DIR_CONFIG ${Teem_DIR})
# Configure Slicer3Config.cmake for the install tree.
CONFIGURE_FILE(
......
......@@ -10,9 +10,9 @@ set(dirs
# Note: Order of of SUBDIRS is important if your projects depend
# on code in other projects (put dependent project later).
if(TEEM_FOUND)
if(Teem_FOUND)
set(dirs ${dirs} vtkTeem)
endif(TEEM_FOUND)
endif(Teem_FOUND)
set(dirs ${dirs}
vtkITK
......
......@@ -11,14 +11,14 @@ include(${VTK_USE_FILE})
find_package(ITK REQUIRED)
include(${ITK_USE_FILE})
option(MRML_USE_TEEM "Build MRML with TEEM support." ON)
mark_as_advanced(MRML_USE_TEEM)
if(MRML_USE_TEEM)
find_package(TEEM REQUIRED)
include(${TEEM_USE_FILE})
option(MRML_USE_Teem "Build MRML with Teem support." ON)
mark_as_advanced(MRML_USE_Teem)
if(MRML_USE_Teem)
find_package(Teem REQUIRED)
include(${Teem_USE_FILE})
option(MRML_USE_vtkTeem "Build MRML with vtkTeem support." ON)
mark_as_advanced(MRML_USE_vtkTeem)
endif(MRML_USE_TEEM)
endif(MRML_USE_Teem)
if(NOT DEFINED BUILD_SHARED_LIBS)
option(BUILD_SHARED_LIBS "Build with shared libraries." ON)
......@@ -37,11 +37,11 @@ set(packages
FreeSurfer
)
if(MRML_USE_TEEM)
if(MRML_USE_Teem)
set(packages ${packages}
vtkTeem
)
endif(MRML_USE_TEEM)
endif(MRML_USE_Teem)
foreach(package
${packages}
......@@ -156,7 +156,7 @@ set(MRML_SRCS
# register code to the vtkMRMLScene constructor
)
if(MRML_USE_TEEM)
if(MRML_USE_Teem)
if(MRML_USE_vtkTeem)
set(MRML_SRCS
${MRML_SRCS}
......@@ -174,7 +174,7 @@ if(MRML_USE_TEEM)
vtkMRMLVectorVolumeNode.cxx
)
endif(MRML_USE_vtkTeem)
endif(MRML_USE_TEEM)
endif(MRML_USE_Teem)
# Abstract/pure virtual classes
......@@ -224,12 +224,12 @@ target_link_libraries(${lib_name}
FreeSurfer
)
if(MRML_USE_TEEM)
target_link_libraries(${lib_name} ${TEEM_LIBRARIES})
if(MRML_USE_Teem)
target_link_libraries(${lib_name} ${Teem_LIBRARIES})
if(MRML_USE_vtkTeem)
target_link_libraries(${lib_name} vtkTeem)
endif(MRML_USE_vtkTeem)
endif(MRML_USE_TEEM)
endif(MRML_USE_Teem)
install(TARGETS ${lib_name}
RUNTIME DESTINATION bin COMPONENT RuntimeLibraries
......
......@@ -8,8 +8,8 @@ endif(COMMAND cmake_policy)
find_package(VTK REQUIRED)
include(${VTK_USE_FILE})
find_package(TEEM REQUIRED)
include(${TEEM_USE_FILE})
find_package(Teem REQUIRED)
include(${Teem_USE_FILE})
if(NOT DEFINED BUILD_SHARED_LIBS)
option(BUILD_SHARED_LIBS "Build with shared libraries." ON)
......@@ -92,15 +92,15 @@ add_library(${lib_name}
)
# after teem 1.9, all the teem libraries are groups in one big libteem.so
if ( ${TEEM_VERSION_MAJOR} GREATER 1 )
set(TEEM_LIBRARIES teem)
else ( ${TEEM_VERSION_MAJOR} GREATER 1 )
if ( ${TEEM_VERSION_MINOR} LESS 10 )
set(TEEM_LIBRARIES air biff nrrd ten ell)
else ( ${TEEM_VERSION_MINOR} LESS 10 )
set(TEEM_LIBRARIES teem)
endif ( ${TEEM_VERSION_MINOR} LESS 10 )
endif ( ${TEEM_VERSION_MAJOR} GREATER 1 )
if ( ${Teem_VERSION_MAJOR} GREATER 1 )
set(Teem_LIBRARIES teem)
else ( ${Teem_VERSION_MAJOR} GREATER 1 )
if ( ${Teem_VERSION_MINOR} LESS 10 )
set(Teem_LIBRARIES air biff nrrd ten ell)
else ( ${Teem_VERSION_MINOR} LESS 10 )
set(Teem_LIBRARIES teem)
endif ( ${Teem_VERSION_MINOR} LESS 10 )
endif ( ${Teem_VERSION_MAJOR} GREATER 1 )
target_link_libraries(${lib_name}
vtkCommon
......@@ -108,7 +108,7 @@ target_link_libraries(${lib_name}
vtkImagingTCL
vtkIOTCL
vtkGraphicsTCL
${TEEM_LIBRARIES}
${Teem_LIBRARIES}
)
install(TARGETS ${lib_name}
......
......@@ -34,7 +34,7 @@
#define ImageDimension 3
class vtkImageData;
class VTK_TEEM_EXPORT vtkBSplineInterpolateImageFunction : public vtkImplicitFunction
class VTK_Teem_EXPORT vtkBSplineInterpolateImageFunction : public vtkImplicitFunction
{
public:
static vtkBSplineInterpolateImageFunction *New();
......
......@@ -68,7 +68,7 @@ class vtkImageData;
class vtkMatrix4x4;
class VTK_TEEM_EXPORT vtkDiffusionTensorGlyph : public vtkTensorGlyph
class VTK_Teem_EXPORT vtkDiffusionTensorGlyph : public vtkTensorGlyph
{
public:
vtkTypeRevisionMacro(vtkDiffusionTensorGlyph,vtkTensorGlyph);
......
......@@ -31,7 +31,7 @@
class vtkMatrix4x4;
class vtkImageData;
class VTK_TEEM_EXPORT vtkDiffusionTensorMathematics : public vtkThreadedImageAlgorithm
class VTK_Teem_EXPORT vtkDiffusionTensorMathematics : public vtkThreadedImageAlgorithm
{
public:
static vtkDiffusionTensorMathematics *New();
......
......@@ -30,7 +30,7 @@
class vtkMatrix4x4;
class vtkImageData;
class VTK_TEEM_EXPORT vtkDiffusionTensorMathematicsSimple : public vtkSimpleImageToImageFilter
class VTK_Teem_EXPORT vtkDiffusionTensorMathematicsSimple : public vtkSimpleImageToImageFilter
{
public:
static vtkDiffusionTensorMathematicsSimple *New();
......
......@@ -26,7 +26,7 @@
//
// Special classes for manipulating data
//BTX
class VTK_TEEM_EXPORT vtkHyperPoint { //;prevent man page generation
class VTK_Teem_EXPORT vtkHyperPoint { //;prevent man page generation
public:
vtkHyperPoint(); // method sets up storage
vtkHyperPoint &operator=(const vtkHyperPoint& hp); //for resizing
......@@ -46,7 +46,7 @@ public:
//ETX
//BTX
class VTK_TEEM_EXPORT vtkHyperArray { //;prevent man page generation
class VTK_Teem_EXPORT vtkHyperArray { //;prevent man page generation
public:
vtkHyperArray();
~vtkHyperArray()
......
......@@ -41,7 +41,7 @@
#include "vtkDiffusionTensorMathematics.h" // for VTK_TENS_FRACTIONAL_ANISOTROPY
#include "vtkTractographyPointAndArray.h"
class VTK_TEEM_EXPORT vtkHyperStreamlineDTMRI : public vtkHyperStreamline
class VTK_Teem_EXPORT vtkHyperStreamlineDTMRI : public vtkHyperStreamline
{
public:
vtkTypeRevisionMacro(vtkHyperStreamlineDTMRI,vtkHyperStreamline);
......
......@@ -11,7 +11,7 @@
#include "teem/ten.h"
#include "teem/nrrd.h"
class VTK_TEEM_EXPORT vtkHyperStreamlineTeem : public vtkHyperStreamlineDTMRI
class VTK_Teem_EXPORT vtkHyperStreamlineTeem : public vtkHyperStreamlineDTMRI
{
public:
......
......@@ -30,7 +30,7 @@
#include "vtkImageToImageFilter.h"
class VTK_TEEM_EXPORT vtkImageGetTensorComponents : public vtkImageToImageFilter
class VTK_Teem_EXPORT vtkImageGetTensorComponents : public vtkImageToImageFilter
{
public:
static vtkImageGetTensorComponents *New();
......
......@@ -26,7 +26,7 @@
#include "vtkThreadedImageAlgorithm.h"
class VTK_TEEM_EXPORT vtkImageLabelCombine : public vtkThreadedImageAlgorithm
class VTK_Teem_EXPORT vtkImageLabelCombine : public vtkThreadedImageAlgorithm
{
public:
static vtkImageLabelCombine *New();
......
......@@ -57,7 +57,7 @@
#define NORMALS 3
#define TENSORS 4
class VTK_TEEM_EXPORT vtkNRRDReader : public vtkMedicalImageReader2
class VTK_Teem_EXPORT vtkNRRDReader : public vtkMedicalImageReader2
{
public:
static vtkNRRDReader *New();
......
......@@ -19,7 +19,7 @@
class vtkImageData;
class VTK_TEEM_EXPORT vtkNRRDWriter : public vtkWriter
class VTK_Teem_EXPORT vtkNRRDWriter : public vtkWriter
{
public:
......
......@@ -29,7 +29,7 @@
#include "vtkTensorGlyph.h"
class VTK_TEEM_EXPORT vtkPolyDataTensorToColor : public vtkPolyDataAlgorithm
class VTK_Teem_EXPORT vtkPolyDataTensorToColor : public vtkPolyDataAlgorithm
{
public:
static vtkPolyDataTensorToColor *New();
......
......@@ -16,7 +16,7 @@
//BTX
#include "vtkPreciseHyperPoint.h"
class VTK_TEEM_EXPORT vtkPreciseHyperArray { //;prevent man page generation
class VTK_Teem_EXPORT vtkPreciseHyperArray { //;prevent man page generation
public:
vtkPreciseHyperArray();
~vtkPreciseHyperArray()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment