Commit 5720d26a authored by Hans Johnson's avatar Hans Johnson Committed by Ben Boeckel

COMP: VTK and ITK H5 build program collision

When both VTK and ITK are built with the same
CMAKE_RUNTIME_OUTPUT_DIRECTORY settings, the H5detect and
H5make_libsettings programs are generated by both VTK and ITK.  These
are intended to be internal build configuration programs that determine
the capabilities of the local compiler and OS.

When VTK and ITK diverge in their version of HDF5, conficts occur that
cause difficult to debug compiler errors.

By adding a prefix here the program name conflict can be avoided.
parent c98eb45f
......@@ -621,6 +621,9 @@ IF (XCODE)
SET (CMD "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/\${CONFIGURATION}/H5detect")
ENDIF ()
ADD_EXECUTABLE (H5detect ${HDF5_SRC_DIR}/H5detect.c)
SET_TARGET_PROPERTIES(H5detect
PROPERTIES
OUTPUT_NAME "vtkH5detect") # XXX(vtk): change the binary name
IF (WIN32)
TARGET_LINK_LIBRARIES (H5detect "ws2_32.lib")
ENDIF ()
......@@ -637,6 +640,9 @@ IF (XCODE)
SET (CMDL "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/\${CONFIGURATION}/H5make_libsettings")
ENDIF ()
ADD_EXECUTABLE (H5make_libsettings ${HDF5_SRC_DIR}/H5make_libsettings.c)
SET_TARGET_PROPERTIES(H5make_libsettings
PROPERTIES
OUTPUT_NAME "vtkH5make_libsettings") # XXX(vtk): change the binary name
IF (WIN32)
TARGET_LINK_LIBRARIES (H5make_libsettings "ws2_32.lib")
ENDIF ()
......
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