Commit 7648c19c authored by Brad King's avatar Brad King Committed by Code Review
Browse files

Merge topic 'restore-HeaderTesting' into master

437db4b1 Restore VTK header tests removed by the modularization
002f853f Mark headers to be excluded from header style tests
adb80137 Fix vtkCommonDataModel and vtkTestingRendering header style
parents 7104e7df 437db4b1
......@@ -153,3 +153,4 @@ public:
// ----------------------------------------------------------------------------
#endif /* VTKAMRENZOREADERINTERNAL_HPP_ */
// VTK-HeaderTest-Exclude: vtkAMREnzoReaderInternal.h
......@@ -206,3 +206,4 @@ public:
// Class vtkFlashReaderInternal ( end )
// ----------------------------------------------------------------------------
#endif /* VTKAMRFLASHREADERINTERNAL_HPP_ */
// VTK-HeaderTest-Exclude: vtkAMRFlashReaderInternal.h
......@@ -299,6 +299,14 @@ VTK_AUTOINIT(${vtk-module})
set_property(TARGET ${vtk-module} APPEND
PROPERTY COMPILE_FLAGS "${VTK_ABI_CXX_FLAGS}")
if(BUILD_TESTING AND PYTHON_EXECUTABLE AND NOT ${vtk-module}_NO_HeaderTest)
string(TOUPPER "${vtk-module}" MOD)
add_test(NAME ${vtk-module}.HeaderTest
COMMAND ${PYTHON_EXECUTABLE} ${VTK_SOURCE_DIR}/Testing/Core/HeaderTesting.py
${CMAKE_CURRENT_SOURCE_DIR} ${MOD}_EXPORT
)
endif()
# Add the module to the list of wrapped modules if necessary
vtk_add_wrapping(${vtk-module} "${ARGN}")
......
......@@ -333,9 +333,13 @@ find_file(VTK_WRAP_HINTS hints ${VTK_SOURCE_DIR}/Wrapping
NO_CMAKE_FIND_ROOT_PATH)
mark_as_advanced(VTK_WRAP_HINTS)
if(VTK_WRAP_PYTHON)
if(BUILD_TESTING OR VTK_WRAP_PYTHON)
# Need PYTHON_EXECUTABLE for HeaderTesting or python wrapping
find_package(PythonInterp QUIET)
mark_as_advanced(PYTHON_EXECUTABLE)
endif()
if(VTK_WRAP_PYTHON)
set(VTK_WRAP_PYTHON_EXE vtkWrapPython)
set(VTK_WRAP_PYTHON_INIT_EXE vtkWrapPythonInit)
set(VTK_PYTHON_EXE vtkpython)
......
......@@ -27,4 +27,5 @@ set_source_files_properties(
configure_file(${vtkChemistryCore_SOURCE_DIR}/vtkChemistryConfigure.h.in
${vtkChemistryCore_BINARY_DIR}/vtkChemistryConfigure.h IMMEDIATE)
set(${vtk-module}_NO_HeaderTest 1) # TODO: Fix headers and enable test.
vtk_module_library(vtkChemistryCore ${Module_SRCS})
......@@ -57,3 +57,4 @@
#endif
#endif // __vtkABI_h
// VTK-HeaderTest-Exclude: vtkABI.h
......@@ -267,3 +267,4 @@ void vtkArray::SetVariantValue(CoordinateT i, CoordinateT j, CoordinateT k, cons
#endif
// VTK-HeaderTest-Exclude: vtkArray.h
......@@ -112,3 +112,4 @@ private:
#endif
// VTK-HeaderTest-Exclude: vtkArrayCoordinates.h
......@@ -208,3 +208,4 @@ private:
};
#endif
// VTK-HeaderTest-Exclude: vtkArrayExtents.h
......@@ -95,3 +95,4 @@ private:
#endif
// VTK-HeaderTest-Exclude: vtkArrayExtentsList.h
......@@ -62,3 +62,4 @@ void vtkInterpolate(
#endif
// VTK-HeaderTest-Exclude: vtkArrayInterpolate.h
......@@ -40,3 +40,4 @@
#endif
// VTK-HeaderTest-Exclude: vtkArrayIteratorIncludes.h
......@@ -133,3 +133,4 @@ private:
# undef VTK_ARRAY_ITERATOR_TEMPLATE_TYPE
#endif
// VTK-HeaderTest-Exclude: vtkArrayIteratorTemplate.h
......@@ -49,3 +49,4 @@ void vtkPrintVectorFormat(ostream& stream, vtkTypedArray<T>* vector);
#include "vtkArrayPrint.txx"
#endif
// VTK-HeaderTest-Exclude: vtkArrayPrint.h
......@@ -95,3 +95,4 @@ private:
};
#endif
// VTK-HeaderTest-Exclude: vtkArrayRange.h
......@@ -107,3 +107,4 @@ private:
#endif
// VTK-HeaderTest-Exclude: vtkArraySort.h
......@@ -97,3 +97,4 @@ protected:
#endif
// VTK-HeaderTest-Exclude: vtkArrayWeights.h
......@@ -34,3 +34,4 @@
struct M##_AutoInit { M##_AutoInit(); ~M##_AutoInit(); }; static M##_AutoInit M##_AutoInit_Instance;
#endif
// VTK-HeaderTest-Exclude: vtkAutoInit.h
......@@ -46,3 +46,4 @@ public:
};
#endif // #ifndef __vtkBreakPoint_h
// VTK-HeaderTest-Exclude: vtkBreakPoint.h
......@@ -124,3 +124,4 @@ private:
};
#endif
// VTK-HeaderTest-Exclude: vtkByteSwap.h
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment