From eac7ed5f56d82ac5aba78e7824808b5eefdae2c0 Mon Sep 17 00:00:00 2001 From: Vivien Delmon Date: Tue, 30 Aug 2011 13:34:16 +0200 Subject: [PATCH] merge master --- segmentation/clitkMotionMaskGenericFilter.txx | 2 +- vv/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/segmentation/clitkMotionMaskGenericFilter.txx b/segmentation/clitkMotionMaskGenericFilter.txx index 414a2f6..d094baf 100644 --- a/segmentation/clitkMotionMaskGenericFilter.txx +++ b/segmentation/clitkMotionMaskGenericFilter.txx @@ -384,7 +384,7 @@ MotionMaskGenericFilter::GetLungsImage(typename itk::Image typename RelabelFilterType::Pointer relabelFilter=RelabelFilterType::New(); relabelFilter->SetInput(connectFilter->GetOutput()); if (m_Verbose) std::cout<<"Sorting the labels..."< (relabelFilter->GetOutput(), "/home/jef/tmp/labels.mhd"); + // writeImage (relabelFilter->GetOutput(), "/home/vdelmon/tmp/labels.mhd"); //--------------------------------- // Keep the label diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt index ccb9ef2..eca1062 100644 --- a/vv/CMakeLists.txt +++ b/vv/CMakeLists.txt @@ -204,7 +204,7 @@ clitkCommon ${ITK_LIBRARIES} QVTK vtkHybrid) # Install options (also used by CPack) IF(UNIX AND NOT APPLE) SET_TARGET_PROPERTIES(vv - PROPERTIES INSTALL_RPATH "${VTK_DIR}:${ITK_DIR}" ) + PROPERTIES INSTALL_RPATH "${VTK_DIR}:${ITK_DIR}/lib") INSTALL (TARGETS vv DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE) # INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/ducky.png DESTINATION .) -- 2.45.1