Commit fac24d1d authored by Brad King's avatar Brad King

ENH: Cleanup vtkHashSource command dependencies

We take advantage of CMake 2.6 custom-command and target export/import
features to simplify the reference to the vtkHashSource tool.  This also
enables a file-level dependency between vtkSocketCommunicatorHash.h and
the vtkHashSource executable so it will be regenerated when the tool
rebuilds.
parent 455862a7
......@@ -225,11 +225,11 @@ INCLUDE(${VTK_CMAKE_DIR}/KitCommonBlock.cmake)
ADD_CUSTOM_COMMAND(
OUTPUT ${VTK_BINARY_DIR}/Parallel/vtkSocketCommunicatorHash.h
DEPENDS ${VTK_SOURCE_DIR}/Parallel/vtkSocketCommunicator.cxx
COMMAND ${VTK_HASHSOURCE_EXE}
vtkHashSource
COMMAND vtkHashSource
${VTK_SOURCE_DIR}/Parallel/vtkSocketCommunicator.cxx
vtkSocketCommunicatorHash vtkSocketCommunicatorHash.h
)
ADD_DEPENDENCIES(vtkParallel vtkHashSource)
IF (VTK_USE_MPI)
IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
......
......@@ -20,11 +20,3 @@ IF(NOT CMAKE_CROSSCOMPILING)
ADD_DEPENDENCIES(${COMPILE_TOOLS_TARGET} vtkHashSource)
ENDIF(COMPILE_TOOLS_TARGET)
ENDIF(NOT CMAKE_CROSSCOMPILING)
IF(CMAKE_CROSSCOMPILING)
SET(HASHSOURCE_EXE vtkHashSource)
ELSE(CMAKE_CROSSCOMPILING)
GET_TARGET_PROPERTY(HASHSOURCE_EXE vtkHashSource LOCATION)
ENDIF(CMAKE_CROSSCOMPILING)
SET(VTK_HASHSOURCE_EXE ${HASHSOURCE_EXE}
CACHE INTERNAL "Source file content hasher." FORCE)
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