Skip to content
Snippets Groups Projects
Commit bce15304 authored by T.J. Corona's avatar T.J. Corona
Browse files

Added a means to prevent private headers from being installed.

This fix addresses bug reports 0014698 and 0014700. Header files that were
named identically to source files were installed. The added flag allows for
a source file to be flagged with SKIP_HEADER_INSTALL, which prevents its
associated header file from being installed (thanks Ben Boeckel!).
parent 676e65ed
Branches
Tags
No related merge requests found
......@@ -563,8 +563,9 @@ function(vtk_module_library name)
foreach(arg ${ARGN})
get_filename_component(src "${arg}" ABSOLUTE)
get_source_file_property(_skip_install ${src} SKIP_HEADER_INSTALL)
string(REGEX REPLACE "\\.(cxx|mm)$" ".h" hdr "${src}")
if("${hdr}" MATCHES "\\.h$" AND EXISTS "${hdr}")
if("${hdr}" MATCHES "\\.h$" AND EXISTS "${hdr}" AND NOT _skip_install)
list(APPEND _hdrs "${hdr}")
elseif("${src}" MATCHES "\\.txx$" AND EXISTS "${src}")
list(APPEND _hdrs "${src}")
......
......@@ -16,10 +16,16 @@ set_source_files_properties(
vtkCPExodusIIResultsArrayTemplate
vtkExodusIIReaderParser
vtkExodusIIReaderVariableCheck
WRAP_EXCLUDE
PROPERTIES
WRAP_EXCLUDE 1
)
set_source_files_properties(
vtkExodusIIReaderVariableCheck
PROPERTIES
SKIP_HEADER_INSTALL 1
)
set(vtkIOExodus_HDRS
vtkCPExodusIINodalCoordinatesTemplate.h
vtkCPExodusIIResultsArrayTemplate.h
......
......@@ -22,7 +22,15 @@ set_source_files_properties(
vtkLSDynaPartCollection
private/LSDynaFamily
private/LSDynaMetaData
WRAP_EXCLUDE
PROPERTIES
WRAP_EXCLUDE 1
)
set_source_files_properties(
private/LSDynaFamily
private/LSDynaMetaData
PROPERTIES
SKIP_HEADER_INSTALL 1
)
vtk_module_library(vtkIOLSDyna ${Module_SRCS})
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment