Commit b2bdadbe authored by Dan Lipsa's avatar Dan Lipsa Committed by Brad King

Fix conflicts in cmake files from hd5 upgrade.

These files did not seem to be used.

Change-Id: I0c8fbb487416a9b7d0b73b48b7ac90c9691b190a
parent f1a5ecfd
cmake_minimum_required(VERSION 2.8.10 FATAL_ERROR)
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
###############################################################################################################
# This script will build and run the examples from a compressed file
# Execute from a command line:
......
<<<<<<< HEAD
||||||| merged common ancestors
cmake_minimum_required (VERSION 2.8)
=======
cmake_minimum_required (VERSION 2.8.11)
>>>>>>> hdf5-upstream
PROJECT (HDF5_HL_CPP_SRC)
#-----------------------------------------------------------------------------
......@@ -36,56 +31,26 @@ install (
FILES
${HDF5_HL_CPP_HDRS}
DESTINATION
<<<<<<< HEAD
${VTK_INSTALL_INCLUDE_DIR}/vtkhdf5/hl/cpp
||||||| merged common ancestors
include/hl/cpp
=======
${HDF5_INSTALL_INCLUDE_DIR}
COMPONENT
hlcppheaders
>>>>>>> hdf5-upstream
)
#-----------------------------------------------------------------------------
# Add Target(s) to CMake Install for import into other projects
#-----------------------------------------------------------------------------
<<<<<<< HEAD
IF (HDF5_EXPORTED_TARGETS AND NOT VTK_INSTALL_NO_LIBRARIES)
INSTALL (
||||||| merged common ancestors
IF (HDF5_EXPORTED_TARGETS)
INSTALL (
=======
if (HDF5_EXPORTED_TARGETS)
if (HDF5_EXPORTED_TARGETS AND NOT VTK_INSTALL_NO_LIBRARIES)
if (BUILD_SHARED_LIBS)
INSTALL_TARGET_PDB (${HDF5_HL_CPP_LIB_TARGET} ${HDF5_INSTALL_LIB_DIR} hlcpplibraries)
endif (BUILD_SHARED_LIBS)
install (
>>>>>>> hdf5-upstream
TARGETS
${HDF5_HL_CPP_LIB_TARGET}
EXPORT
${HDF5_EXPORTED_TARGETS}
<<<<<<< HEAD
RUNTIME DESTINATION ${VTK_INSTALL_RUNTIME_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${VTK_INSTALL_LIBRARY_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${VTK_INSTALL_ARCHIVE_DIR} COMPONENT Development
||||||| merged common ancestors
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
RUNTIME DESTINATION bin
=======
LIBRARY DESTINATION ${HDF5_INSTALL_LIB_DIR} COMPONENT hlcpplibraries
ARCHIVE DESTINATION ${HDF5_INSTALL_LIB_DIR} COMPONENT hlcpplibraries
RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT hlcpplibraries
>>>>>>> hdf5-upstream
LIBRARY DESTINATION ${VTK_INSTALL_LIBRARY_DIR} COMPONENT hlcpplibraries
ARCHIVE DESTINATION ${VTK_INSTALL_ARCHIVE_DIR} COMPONENT hlcpplibraries
RUNTIME DESTINATION ${{VTK_INSTALL_RUNTIME_DIR} COMPONENT hlcpplibraries
)
<<<<<<< HEAD
ENDIF ()
||||||| merged common ancestors
ENDIF (HDF5_EXPORTED_TARGETS)
=======
endif (HDF5_EXPORTED_TARGETS)
>>>>>>> hdf5-upstream
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