Skip to content

Commit 95e8549

Browse files
albert-githubdzenanz
albert-github
authored and
dzenanz
committed
DOC: Fix expansion of macros with ; by CMake for doxygen PREDEFINED
1 parent 7414f89 commit 95e8549

File tree

2 files changed

+94
-94
lines changed

2 files changed

+94
-94
lines changed

‎Utilities/Doxygen/DoxygenConfig.cmake

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -86,58 +86,58 @@ set(DOXYGEN_SEARCH_INCLUDES "NO")
8686
set(DOXYGEN_PREDEFINED
8787
"itkNotUsed(x)="
8888
"itkStaticConstMacro(name,type,value)=static constexpr type name = value"
89-
"itkSetInputMacro(name, type, number)= virtual void Set##name##Input(const type *_arg); virtual void SetInput##number(const type *_arg);"
90-
"itkGetInputMacro(name, type, number)= virtual const type * Get##name##Input() const; virtual const type * GetInput##number() const;"
91-
"itkSetMacro(name,type)= virtual void Set##name (type _arg);"
92-
"itkGetMacro(name,type)= virtual type Get##name ();"
93-
"itkGetConstMacro(name,type)= virtual type Get##name () const;"
94-
"itkSetStringMacro(name)= virtual void Set##name (const char* _arg);"
95-
"itkGetStringMacro(name)= virtual const char* Get##name () const;"
96-
"itkSetClampMacro(name,type,min,max)= virtual void Set##name (type _arg);"
97-
"itkSetObjectMacro(name,type)= virtual void Set##name (type* _arg);"
98-
"itkSetConstObjectMacro(name,type)= virtual void Set##name ( const type* _arg);"
99-
"itkGetConstObjectMacro(name,type)= virtual const type* Get##name () const;"
100-
"itkGetModifiableObjectMacro(name,type)= virtual type* GetModifiable##name (); virtual const type* Get##name () const;"
101-
"itkGetConstReferenceMacro(name,type)= virtual const type& Get##name () const;"
102-
"itkSetEnumMacro(name,type)= virtual void Set##name (const type _arg);"
103-
"itkGetEnumMacro(name,type)= virtual type Get##name () const;"
104-
"itkGetConstReferenceObjectMacro(name,type)= virtual const type::Pointer& Get##name () const;"
105-
"itkSetDecoratedInputMacro(name, type)= virtual void Set##name##Input(const SimpleDataObjectDecorator<type> *_arg); virtual void Set##name(const type &_arg); void Set##name(const SimpleDataObjectDecorator< type > *_arg)"
106-
"itkGetDecoratedInputMacro(name, type)= virtual const SimpleDataObjectDecorator< type > * Get##name##Input() const; virtual const type & Get##name() const;"
107-
"itkSetGetDecoratedInputMacro(name, type)= virtual void Set##name##Input(const SimpleDataObjectDecorator< type > *_arg); virtual void Set##name(const type &_arg); virtual void Set##name(const SimpleDataObjectDecorator< type > *_arg); virtual const SimpleDataObjectDecorator< type > * Get##name##Input() const; virtual const type & Get##name() const;"
108-
"itkSetDecoratedObjectInputMacro(name, type, number)= virtual void Set##name##Input(const DataObjectDecorator<type> *_arg); virtual void SetInput##number(const DataObjectDecorator<type> *_arg); virtual const DataObjectDecorator<type> * Get##name##Input() const; virtual const DataObjectDecorator<type> * GetInput##number() const; virtual void Set##name(const type *_arg);"
109-
"itkGetDecoratedObjectInputMacro(name, type)= virtual const DataObjectDecorator< type > * Get##name##Input() const; virtual const type * Get##name() const;"
110-
"itkSetGetDecoratedObjectInputMacro(name, type)= virtual void Set##name##Input(const DataObjectDecorator<type> *_arg); virtual void SetInput##number(const DataObjectDecorator<type> *_arg); virtual const DataObjectDecorator<type> * Get##name##Input() const; virtual const DataObjectDecorator<type> * GetInput##number() const; virtual void Set##name(const type *_arg); virtual const DataObjectDecorator< type > * Get##name##Input() const; virtual const type * Get##name() const;"
111-
"itkSetDecoratedOutputMacro(name, type)= virtual void Set##name##Output(const SimpleDataObjectDecorator<type> *_arg); virtual void Set##name(const type &_arg); void Set##name(const SimpleDataObjectDecorator< type > *_arg)"
112-
"itkGetDecoratedOutputMacro(name, type)= virtual const SimpleDataObjectDecorator< type > * Get##name##Output() const; virtual const type & Get##name() const;"
113-
"itkBooleanMacro(name)= virtual void name##On (); virtual void name##Off ();"
114-
"itkSetVector2Macro(name,type)= virtual void Set##name (type _arg1, type _arg2) virtual void Set##name (type _arg[2]);"
115-
"itkGetVector2Macro(name,type)= virtual type* Get##name () const; virtual void Get##name (type& _arg1, type& _arg2) const; virtual void Get##name (type _arg[2]) const;"
116-
"itkSetVector3Macro(name,type)= virtual void Set##name (type _arg1, type _arg2, type _arg3) virtual void Set##name (type _arg[3]);"
117-
"itkGetVector3Macro(name,type)= virtual type* Get##name () const; virtual void Get##name (type& _arg1, type& _arg2, type& _arg3) const; virtual void Get##name (type _arg[3]) const;"
118-
"itkSetVector4Macro(name,type)= virtual void Set##name (type _arg1, type _arg2, type _arg3, type _arg4) virtual void Set##name (type _arg[4]);"
119-
"itkGetVector4Macro(name,type)= virtual type* Get##name () const; virtual void Get##name (type& _arg1, type& _arg2, type& _arg3, type& _arg4) const; virtual void Get##name (type _arg[4]) const;"
120-
"itkSetVector6Macro(name,type)= virtual void Set##name (type _arg1, type _arg2, type _arg3, type _arg4, type _arg5, type _arg6) virtual void Set##name (type _arg[6]);"
121-
"itkGetVector6Macro(name,type)= virtual type* Get##name () const; virtual void Get##name (type& _arg1, type& _arg2, type& _arg3, type& _arg4, type& _arg5, type& _arg6) const; virtual void Get##name (type _arg[6]) const;"
122-
"itkSetVectorMacro(name,type,count)= virtual void Set##name(type data[]);"
123-
"itkGetVectorMacro(name,type,count)= virtual type* Get##name () const;"
124-
"itkSetInputMacro(name,type)= virtual void Set##name(const type *input);"
125-
"itkGetInputMacro(name,type)= virtual const type * Get##name() const;"
126-
"itkNewMacro(type)= static Pointer New(); virtual::itk::LightObject::Pointer CreateAnother() const;"
127-
"itkSimpleNewMacro(type)= static Pointer New();"
128-
"itkCreateAnotherMacro(type)= virtual::itk::LightObject::Pointer CreateAnother() const;"
129-
"itkFactorylessNewMacro(x)= static Pointer New(); virtual ::itk::LightObject::Pointer CreateAnother() const;"
130-
"itkTypeMacro(thisClass,superclass)= virtual const char *GetNameOfClass() const;"
131-
"itkVirtualGetNameOfClassMacro(thisClass)= virtual const char * GetNameOfClass() const;"
132-
"itkOverrideGetNameOfClassMacro(thisClass)= const char * GetNameOfClass() const override;"
133-
"itkEventMacro(thisClass,superclass)= class thisClass : public superclass {};"
134-
"itkDeclareExceptionMacro(newexcp,parentexcp,whatmessage)= namespace itk { class newexcp : public parentexcp { public: newexcp(const char *file, unsigned int lineNumber) : parentexcp(file, lineNumber) { this->SetDescription(whatmessage); } newexcp(const std::string & file, unsigned int lineNumber) : parentexcp(file, lineNumber) { this->SetDescription(whatmessage); } itkTypeMacro(newexcp, , parentexcp); }; }"
89+
"itkSetInputMacro(name, type, number)= virtual void Set##name##Input(const type *_arg)\; virtual void SetInput##number(const type *_arg)\;"
90+
"itkGetInputMacro(name, type, number)= virtual const type * Get##name##Input() const\; virtual const type * GetInput##number() const\;"
91+
"itkSetMacro(name,type)= virtual void Set##name (type _arg)\;"
92+
"itkGetMacro(name,type)= virtual type Get##name ()\;"
93+
"itkGetConstMacro(name,type)= virtual type Get##name () const\;"
94+
"itkSetStringMacro(name)= virtual void Set##name (const char* _arg)\;"
95+
"itkGetStringMacro(name)= virtual const char* Get##name () const\;"
96+
"itkSetClampMacro(name,type,min,max)= virtual void Set##name (type _arg)\;"
97+
"itkSetObjectMacro(name,type)= virtual void Set##name (type* _arg)\;"
98+
"itkSetConstObjectMacro(name,type)= virtual void Set##name ( const type* _arg)\;"
99+
"itkGetConstObjectMacro(name,type)= virtual const type* Get##name () const\;"
100+
"itkGetModifiableObjectMacro(name,type)= virtual type* GetModifiable##name ()\; virtual const type* Get##name () const\;"
101+
"itkGetConstReferenceMacro(name,type)= virtual const type& Get##name () const\;"
102+
"itkSetEnumMacro(name,type)= virtual void Set##name (const type _arg)\;"
103+
"itkGetEnumMacro(name,type)= virtual type Get##name () const\;"
104+
"itkGetConstReferenceObjectMacro(name,type)= virtual const type::Pointer& Get##name () const\;"
105+
"itkSetDecoratedInputMacro(name, type)= virtual void Set##name##Input(const SimpleDataObjectDecorator<type> *_arg)\; virtual void Set##name(const type &_arg)\; void Set##name(const SimpleDataObjectDecorator< type > *_arg)"
106+
"itkGetDecoratedInputMacro(name, type)= virtual const SimpleDataObjectDecorator< type > * Get##name##Input() const\; virtual const type & Get##name() const\;"
107+
"itkSetGetDecoratedInputMacro(name, type)= virtual void Set##name##Input(const SimpleDataObjectDecorator< type > *_arg)\; virtual void Set##name(const type &_arg)\; virtual void Set##name(const SimpleDataObjectDecorator< type > *_arg)\; virtual const SimpleDataObjectDecorator< type > * Get##name##Input() const\; virtual const type & Get##name() const\;"
108+
"itkSetDecoratedObjectInputMacro(name, type, number)= virtual void Set##name##Input(const DataObjectDecorator<type> *_arg)\; virtual void SetInput##number(const DataObjectDecorator<type> *_arg)\; virtual const DataObjectDecorator<type> * Get##name##Input() const\; virtual const DataObjectDecorator<type> * GetInput##number() const\; virtual void Set##name(const type *_arg)\;"
109+
"itkGetDecoratedObjectInputMacro(name, type)= virtual const DataObjectDecorator< type > * Get##name##Input() const\; virtual const type * Get##name() const\;"
110+
"itkSetGetDecoratedObjectInputMacro(name, type)= virtual void Set##name##Input(const DataObjectDecorator<type> *_arg)\; virtual void SetInput##number(const DataObjectDecorator<type> *_arg)\; virtual const DataObjectDecorator<type> * Get##name##Input() const\; virtual const DataObjectDecorator<type> * GetInput##number() const\; virtual void Set##name(const type *_arg)\; virtual const DataObjectDecorator< type > * Get##name##Input() const\; virtual const type * Get##name() const\;"
111+
"itkSetDecoratedOutputMacro(name, type)= virtual void Set##name##Output(const SimpleDataObjectDecorator<type> *_arg)\; virtual void Set##name(const type &_arg)\; void Set##name(const SimpleDataObjectDecorator< type > *_arg)"
112+
"itkGetDecoratedOutputMacro(name, type)= virtual const SimpleDataObjectDecorator< type > * Get##name##Output() const\; virtual const type & Get##name() const\;"
113+
"itkBooleanMacro(name)= virtual void name##On ()\; virtual void name##Off ()\;"
114+
"itkSetVector2Macro(name,type)= virtual void Set##name (type _arg1, type _arg2) virtual void Set##name (type _arg[2])\;"
115+
"itkGetVector2Macro(name,type)= virtual type* Get##name () const\; virtual void Get##name (type& _arg1, type& _arg2) const\; virtual void Get##name (type _arg[2]) const\;"
116+
"itkSetVector3Macro(name,type)= virtual void Set##name (type _arg1, type _arg2, type _arg3) virtual void Set##name (type _arg[3])\;"
117+
"itkGetVector3Macro(name,type)= virtual type* Get##name () const\; virtual void Get##name (type& _arg1, type& _arg2, type& _arg3) const\; virtual void Get##name (type _arg[3]) const\;"
118+
"itkSetVector4Macro(name,type)= virtual void Set##name (type _arg1, type _arg2, type _arg3, type _arg4) virtual void Set##name (type _arg[4])\;"
119+
"itkGetVector4Macro(name,type)= virtual type* Get##name () const\; virtual void Get##name (type& _arg1, type& _arg2, type& _arg3, type& _arg4) const\; virtual void Get##name (type _arg[4]) const\;"
120+
"itkSetVector6Macro(name,type)= virtual void Set##name (type _arg1, type _arg2, type _arg3, type _arg4, type _arg5, type _arg6) virtual void Set##name (type _arg[6])\;"
121+
"itkGetVector6Macro(name,type)= virtual type* Get##name () const\; virtual void Get##name (type& _arg1, type& _arg2, type& _arg3, type& _arg4, type& _arg5, type& _arg6) const\; virtual void Get##name (type _arg[6]) const\;"
122+
"itkSetVectorMacro(name,type,count)= virtual void Set##name(type data[])\;"
123+
"itkGetVectorMacro(name,type,count)= virtual type* Get##name () const\;"
124+
"itkSetInputMacro(name,type)= virtual void Set##name(const type *input)\;"
125+
"itkGetInputMacro(name,type)= virtual const type * Get##name() const\;"
126+
"itkNewMacro(type)= static Pointer New()\; virtual::itk::LightObject::Pointer CreateAnother() const\;"
127+
"itkSimpleNewMacro(type)= static Pointer New()\;"
128+
"itkCreateAnotherMacro(type)= virtual::itk::LightObject::Pointer CreateAnother() const\;"
129+
"itkFactorylessNewMacro(x)= static Pointer New()\; virtual ::itk::LightObject::Pointer CreateAnother() const\;"
130+
"itkTypeMacro(thisClass,superclass)= virtual const char *GetNameOfClass() const\;"
131+
"itkVirtualGetNameOfClassMacro(thisClass)= virtual const char * GetNameOfClass() const\;"
132+
"itkOverrideGetNameOfClassMacro(thisClass)= const char * GetNameOfClass() const override\;"
133+
"itkEventMacro(thisClass,superclass)= class thisClass : public superclass {}\;"
134+
"itkDeclareExceptionMacro(newexcp,parentexcp,whatmessage)= namespace itk { class newexcp : public parentexcp { public: newexcp(const char *file, unsigned int lineNumber) : parentexcp(file, lineNumber) { this->SetDescription(whatmessage)\; } newexcp(const std::string & file, unsigned int lineNumber) : parentexcp(file, lineNumber) { this->SetDescription(whatmessage)\; } itkTypeMacro(newexcp, , parentexcp)\; }\; }"
135135
"itkConceptMacro(thisName,thisConcept)= /* This class requires thisName in the form of thisConcept */"
136136
"std::numeric_limits= std::numeric_limits"
137137
"ITK_TYPENAME= typename"
138138
"itkTemplateFloatingToIntegerMacro(name)= template <TReturn, typename TInput> name(TInput x)"
139-
"FEM_ABSTRACT_CLASS(thisClass,parentClass)= public: /** Standard Self typedef.*/ typedef thisClass Self; /** Standard Superclass typedef. */ typedef parentClass Superclass; /** Pointer or SmartPointer to an object. */ typedef Self* Pointer; /** Const pointer or SmartPointer to an object. */ typedef const Self* ConstPointer; private:"
140-
"FEM_CLASS(thisClass,parentClass)= FEM_ABSTRACT_CLASS(thisClass,parentClass) public: /** Create a new object from the existing one */ virtual Baseclass::Pointer Clone() const; /** Class ID for FEM object factory */ static const int CLID; /** Virtual function to access the class ID */ virtual int ClassID() const { return CLID; } /** Object creation in an itk compatible way */ static Self::Pointer New() { return new Self(); } private:"
139+
"FEM_ABSTRACT_CLASS(thisClass,parentClass)= public: /** Standard Self typedef.*/ typedef thisClass Self\; /** Standard Superclass typedef. */ typedef parentClass Superclass\; /** Pointer or SmartPointer to an object. */ typedef Self* Pointer\; /** Const pointer or SmartPointer to an object. */ typedef const Self* ConstPointer\; private:"
140+
"FEM_CLASS(thisClass,parentClass)= FEM_ABSTRACT_CLASS(thisClass,parentClass) public: /** Create a new object from the existing one */ virtual Baseclass::Pointer Clone() const\; /** Class ID for FEM object factory */ static const int CLID\; /** Virtual function to access the class ID */ virtual int ClassID() const { return CLID\; } /** Object creation in an itk compatible way */ static Self::Pointer New() { return new Self()\; } private:"
141141
"ERROR_CHECKING"
142142
"VCL_USE_NATIVE_STL=1"
143143
"VCL_USE_NATIVE_COMPLEX=1"

0 commit comments

Comments
 (0)