From 01f005a9cbf863ec2169b1076409f0bcac233aad Mon Sep 17 00:00:00 2001 From: jean-pierre roux Date: Thu, 12 Mar 2009 08:24:35 +0000 Subject: [PATCH] Normalize names --- packages/CMakeLists.txt | 5 ++++- packages/gdcmvtk/CMakeLists.txt | 2 -- ...{exGetInfoGdcmReader.bbs => ExampleGetInfoGdcmReader.bbs} | 0 packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.cxx | 3 --- 4 files changed, 4 insertions(+), 6 deletions(-) rename packages/gdcmvtk/bbs/appli/{exGetInfoGdcmReader.bbs => ExampleGetInfoGdcmReader.bbs} (100%) diff --git a/packages/CMakeLists.txt b/packages/CMakeLists.txt index 94decf3..c4d750e 100644 --- a/packages/CMakeLists.txt +++ b/packages/CMakeLists.txt @@ -7,13 +7,16 @@ SUBDIRS(vtk) SUBDIRS(toolsbbtk) SUBDIRS(wxvtk) SUBDIRS(itkvtk) -SUBDIRS(gdcmvtk) SUBDIRS(demo) SUBDIRS(appli) +SUBDIRS(gdcmvtk) + + IF(BBTK_USE_KWWIDGETS) SUBDIRS(kw) ENDIF(BBTK_USE_KWWIDGETS) + #----------------------------------------------------------------------------- diff --git a/packages/gdcmvtk/CMakeLists.txt b/packages/gdcmvtk/CMakeLists.txt index ce1eb62..9d253a7 100644 --- a/packages/gdcmvtk/CMakeLists.txt +++ b/packages/gdcmvtk/CMakeLists.txt @@ -115,7 +115,6 @@ SET(${BBTK_PACKAGE_NAME}_INCLUDE_DIRS # - automatically handled libraries or packages : wx, vtk... (see above) # - the dirs automatically set by other libraries found by FIND_PACKAGE ../std/src - #/usr/local/include/gdcm/ # The path to the build tree folder is needed to find bbstd_EXPORT.h ${PROJECT_BINARY_DIR}/packages/std/src ) @@ -125,7 +124,6 @@ SET(${BBTK_PACKAGE_NAME}_INCLUDE_DIRS SET(${BBTK_PACKAGE_NAME}_LIBS # LIST HERE THE ADDITIONAL LIBS TO LINK AGAINST # EXCEPT : the same libs than for INCLUDE_DIRS - #/usr/local/lib/gdcm/libvtkgdcm.so ) #=========================================================================== diff --git a/packages/gdcmvtk/bbs/appli/exGetInfoGdcmReader.bbs b/packages/gdcmvtk/bbs/appli/ExampleGetInfoGdcmReader.bbs similarity index 100% rename from packages/gdcmvtk/bbs/appli/exGetInfoGdcmReader.bbs rename to packages/gdcmvtk/bbs/appli/ExampleGetInfoGdcmReader.bbs diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.cxx b/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.cxx index 75b96f0..7877be5 100644 --- a/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.cxx +++ b/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.cxx @@ -14,20 +14,17 @@ BBTK_ADD_BLACK_BOX_TO_PACKAGE(gdcmvtk,GetInfoGdcmReader) BBTK_BLACK_BOX_IMPLEMENTATION(GetInfoGdcmReader,bbtk::AtomicBlackBox); void GetInfoGdcmReader::Process() { -std::cout << "Entree ds GetInfoGdcmReader::Process()" << std::endl; f = GDCM_NAME_SPACE::File::New(); f->SetFileName( bbGetInputIn() ); bool res = f->Load(); if ( !res ) { -std::cout << " f->Load() failed ..." << std::endl; f->Delete(); bbSetOutputOut(0); return; } -std::cout << "apres f->Load()" << std::endl; int i; std::vector v_iop; -- 2.45.1