Skip to content
Snippets Groups Projects
Commit 8a118cff authored by Brad King's avatar Brad King Committed by Code Review
Browse files

Merge topic 'fix-CMP0040-CMP0046-warnings' into master

d19b4db8 COMP: Drop missing dependencies of target 'vtkpython_pyc'
7df9a25f COMP: Drop invalid custom commands from HDF5
parents 2117e209 d19b4db8
No related branches found
No related tags found
No related merge requests found
......@@ -604,27 +604,6 @@ ADD_CUSTOM_COMMAND (
DEPENDS H5make_libsettings
)
ADD_CUSTOM_COMMAND (
TARGET ${HDF5_BINARY_DIR}/H5Edefin.h
PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E perl ${HDF5_SOURCE_DIR}/bin/make_err ${HDF5_SOURCE_DIR}/src/H5err.txt
COMMENT " Creating err headers"
)
ADD_CUSTOM_COMMAND (
TARGET ${HDF5_BINARY_DIR}/H5version.h
PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E perl ${HDF5_SOURCE_DIR}/bin/make_vers ${HDF5_SOURCE_DIR}/src/H5vers.txt
COMMENT " Creating API version macro"
)
ADD_CUSTOM_COMMAND (
TARGET ${HDF5_BINARY_DIR}/H5overflow.h
PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E perl ${HDF5_SOURCE_DIR}/bin/make_overflow ${HDF5_SOURCE_DIR}/src/H5overflow.txt
COMMENT " Creating Assignment overflow macro"
)
#-----------------------------------------------------------------------------
# Add H5Tinit source to build - generated by H5Detect/CMake at configure time
#-----------------------------------------------------------------------------
......
......@@ -83,14 +83,6 @@ endif()
# Link against all the kit wrappers.
list(APPEND VTKPYTHON_LINK_LIBS vtkWrappingPythonCore)
set(vtkpython_pyc_depends
vtkCommonPython
vtkFilteringPython
vtkIOPython
vtkGraphicsPython
vtkImagingPython
)
if(PYTHON_UTIL_LIBRARY)
list(APPEND VTKPYTHON_LINK_LIBS ${PYTHON_UTIL_LIBRARY})
endif()
......@@ -265,7 +257,7 @@ if(PYTHON_EXECUTABLE)
DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/vtk_compile_complete")
add_dependencies(vtkpython_pyc
vtkpython
${vtkpython_pyc_depends})
)
# If no runtime is to be installed then do not install python modules.
if(NOT VTK_INSTALL_NO_RUNTIME)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment