From 70c994383384fe546b79d96d6edf8b48c4759902 Mon Sep 17 00:00:00 2001 From: Vivien Delmon Date: Mon, 7 Nov 2011 17:53:01 +0100 Subject: [PATCH] Be compatible with itk 3.20 with debug on --- itk/clitkRelativePositionDataBase.cxx | 9 ++++++++- itk/clitkRelativePositionDataBase.h | 1 + tools/CMakeLists.txt | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/itk/clitkRelativePositionDataBase.cxx b/itk/clitkRelativePositionDataBase.cxx index a9b7327..1512e4c 100644 --- a/itk/clitkRelativePositionDataBase.cxx +++ b/itk/clitkRelativePositionDataBase.cxx @@ -231,7 +231,14 @@ namespace clitk { return true; } //-------------------------------------------------------------------- - + + //-------------------------------------------------------------------- + std::ostream& operator<<(std::ostream & os, const clitk::RelativePositionInformationType & rp) + { + rp.Print(os); + return os; + } + //-------------------------------------------------------------------- } // end namespace clitk //-------------------------------------------------------------------- diff --git a/itk/clitkRelativePositionDataBase.h b/itk/clitkRelativePositionDataBase.h index 57cdcec..fa83a3e 100644 --- a/itk/clitkRelativePositionDataBase.h +++ b/itk/clitkRelativePositionDataBase.h @@ -109,6 +109,7 @@ namespace clitk { os << std::endl; } }; + std::ostream& operator<<(std::ostream & os, const clitk::RelativePositionInformationType & rp); //-------------------------------------------------------------------- diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index bd56542..2484c48 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -321,7 +321,7 @@ IF (CLITK_BUILD_TOOLS) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkLabelImageOverlapMeasure) WRAP_GGO(clitkRelativePositionAnalyzer_GGO_C clitkRelativePositionAnalyzer.ggo) - ADD_EXECUTABLE(clitkRelativePositionAnalyzer clitkRelativePositionAnalyzer.cxx ${clitkRelativePositionAnalyzer_GGO_C}) + ADD_EXECUTABLE(clitkRelativePositionAnalyzer ../itk/clitkRelativePositionDataBase.cxx clitkRelativePositionAnalyzer.cxx ${clitkRelativePositionAnalyzer_GGO_C}) TARGET_LINK_LIBRARIES(clitkRelativePositionAnalyzer clitkSegmentationGgoLib clitkCommon ${ITK_LIBRARIES}) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkRelativePositionAnalyzer) @@ -331,7 +331,7 @@ IF (CLITK_BUILD_TOOLS) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkRelativePositionDataBaseAnalyzer) WRAP_GGO(clitkRelativePositionDataBaseBuilder_GGO_C clitkRelativePositionDataBaseBuilder.ggo) - ADD_EXECUTABLE(clitkRelativePositionDataBaseBuilder clitkRelativePositionDataBaseBuilder.cxx ${clitkRelativePositionDataBaseBuilder_GGO_C}) + ADD_EXECUTABLE(clitkRelativePositionDataBaseBuilder ../itk/clitkRelativePositionDataBase.cxx clitkRelativePositionDataBaseBuilder.cxx ${clitkRelativePositionDataBaseBuilder_GGO_C}) TARGET_LINK_LIBRARIES(clitkRelativePositionDataBaseBuilder clitkSegmentationGgoLib clitkCommon ${ITK_LIBRARIES}) SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkRelativePositionDataBaseBuilder) -- 2.45.1