diff --git a/Utilities/ITK/Utilities/CMakeLists.txt b/Utilities/ITK/Utilities/CMakeLists.txt index 7f8c3eecabb4fcf0cd59a6be8a86c6e6f9d53904..010101451a815123c66e7ad99a7a5d2cf486b5eb 100644 --- a/Utilities/ITK/Utilities/CMakeLists.txt +++ b/Utilities/ITK/Utilities/CMakeLists.txt @@ -14,12 +14,12 @@ ITK_THIRD_PARTY_SUBDIR(PNG png) ITK_THIRD_PARTY_SUBDIR(TIFF tiff) SET(OPJ_PREFIX "itk") ITK_THIRD_PARTY_SUBDIR(OpenJPEG openjpeg) +ITK_THIRD_PARTY_SUBDIR(GDCM gdcm) #------------------------------------------------------------------------------ # Other utilities libraries SUBDIRS(MetaIO) SUBDIRS(NrrdIO) SUBDIRS(expat) -SUBDIRS(gdcm) SUBDIRS(nifti) #------------------------------------------------------------------------------ @@ -54,9 +54,14 @@ SET(KWSYS_USE_Directory 1) SET(KWSYS_USE_Base64 1) SET(KWSYS_USE_FundamentalType 1) SET(KWSYS_USE_CommandLineArguments 1) +SET(KWSYS_USE_Process 1) +SET(KWSYS_USE_DynamicLoader 1) +SET(KWSYS_USE_Glob 1) +SET(KWSYS_USE_Registry 1) SET(KWSYS_HEADER_ROOT ${ITK_BINARY_DIR}/Utilities) -SET(KWSYS_LIBRARY_INSTALL_DIR /lib/otb) -SET(KWSYS_HEADER_INSTALL_DIR /include/otb/Utilities/ITK/Utilities) +SET(KWSYS_LIBRARY_INSTALL_DIR /lib/InsightToolkit) +SET(KWSYS_HEADER_INSTALL_DIR /include/InsightToolkit/Utilities) +SET(KWSYS_PROPERTIES_CXX ${ITK_LIBRARY_PROPERTIES}) SUBDIRS(kwsys) #----------------------------------------------------------------------------- @@ -68,5 +73,5 @@ ENDIF(ITK_BUILD_CABLESWIG) #----------------------------------------------------------------------------- # Install the UseITK.cmake file configured from the top-level. -#INSTALL_FILES(/lib/otb ".cmake" "ITKConfig") +INSTALL_FILES(/lib/InsightToolkit ".cmake" "ITKConfig") diff --git a/Utilities/ITK/Utilities/KWStyle/ITK.kws.xml.in b/Utilities/ITK/Utilities/KWStyle/ITK.kws.xml.in new file mode 100644 index 0000000000000000000000000000000000000000..663fb0fa5f9455e4fd034ca62786d861a9e77d8d --- /dev/null +++ b/Utilities/ITK/Utilities/KWStyle/ITK.kws.xml.in @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<Description> +<LineLength>81</LineLength> +<DeclarationOrder>0,1,2</DeclarationOrder> +<Typedefs>[A-Z]</Typedefs> +<InternalVariables>m_[A-Z]</InternalVariables> +<SemicolonSpace>0</SemicolonSpace> +<EndOfFileNewLine>1</EndOfFileNewLine> +<Tabs>1</Tabs> +<Spaces>3</Spaces> +<Comments>/**, *, */,true</Comments> +<Header>"@ITK_SOURCE_DIR@/Utilities/KWStyle/ITKHeader.h",false,true</Header> +<Indent>SPACE,2,true,true</Indent> +<Namespace>itk</Namespace> +<NameOfClass>[NameOfClass],itk</NameOfClass> +<IfNDefDefine>__[NameOfClass]_[Extension]</IfNDefDefine> +<EmptyLines>2</EmptyLines> +<Template>[TNV]</Template> +<Operator>1,1</Operator> +</Description> diff --git a/Utilities/ITK/Utilities/KWStyle/ITKHeader.h b/Utilities/ITK/Utilities/KWStyle/ITKHeader.h new file mode 100644 index 0000000000000000000000000000000000000000..76b9f2e33471be686d9e2109b94c0258c067dd99 --- /dev/null +++ b/Utilities/ITK/Utilities/KWStyle/ITKHeader.h @@ -0,0 +1,16 @@ +/*========================================================================= + + Program: Insight Segmentation & Registration Toolkit + Module: $RCSfile: ITKHeader.h,v $ + Language: C++ + Date: $Date: 2006/04/25 23:20:16 $ + Version: $Revision: 1.1 $ + + Copyright (c) Insight Software Consortium. All rights reserved. + See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ diff --git a/Utilities/ITK/Utilities/KWStyle/ITKOverwrite.txt b/Utilities/ITK/Utilities/KWStyle/ITKOverwrite.txt new file mode 100644 index 0000000000000000000000000000000000000000..e57d39b6aa82b227d95097e5cf597cf040297f3a --- /dev/null +++ b/Utilities/ITK/Utilities/KWStyle/ITKOverwrite.txt @@ -0,0 +1,21 @@ +vnl_c_vector+char-.cxx Header Disable +vnl_c_vector+short-.cxx Header Disable +vnl_c_vector+ushort-.cxx Header Disable +vnl_complex_traits+char-.h Header Disable +vnl_complex_traits+char-.h IfNDefDefine Disable +vnl_matrix+short-.cxx Header Disable +vnl_matrix+char-.cxx Header Disable +vnl_matrix+ushort-.cxx Header Disable +vnl_matrix_fixed+double.3.12-.cxx Header Disable +vnl_matrix_fixed_ref+double.2.2-.cxx Header Disable +vnl_matrix_fixed_ref+double.2.3-.cxx Header Disable +vnl_matrix_fixed_ref+double.3.12-.cxx Header Disable +vnl_matrix_fixed_ref+double.4.3-.cxx Header Disable +vnl_matrix_fixed_ref+double.4.4-.cxx Header Disable +vnl_vector+char-.cxx Header Disable +vnl_vector+short-.cxx Header Disable +vnl_vector+ushort-.cxx Header Disable +itkWeakPointer.h Template Disable +itkBSplineInterpolationWeightFunction.txx Namespace Disable +itkWindowedSincInterpolateImageFunction.h DeclarationOrder Disable +itkCommand.h Typedefs Disable