Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
VTK
VTK
Commits
d3c3bded
Commit
d3c3bded
authored
Dec 12, 2014
by
Ben Boeckel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hdf5: remove conflict markers
Change-Id: Ia2628a44529717f537bbb42fb2cc4be68c7678c8
parent
cdc0428c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
47 deletions
+0
-47
ThirdParty/hdf5/vtkhdf5/c++/CMakeLists.txt
ThirdParty/hdf5/vtkhdf5/c++/CMakeLists.txt
+0
-47
No files found.
ThirdParty/hdf5/vtkhdf5/c++/CMakeLists.txt
View file @
d3c3bded
<<<<<<< HEAD
||||||| merged common ancestors
cmake_minimum_required
(
VERSION 2.8
)
=======
cmake_minimum_required
(
VERSION 2.8.11
)
>>>>>>> hdf5-upstream
PROJECT
(
HDF5_CPP
)
#-----------------------------------------------------------------------------
...
...
@@ -14,21 +9,11 @@ add_definitions (${HDF5_EXTRA_C_FLAGS})
#-----------------------------------------------------------------------------
# Shared/Static Libs
#-----------------------------------------------------------------------------
<<<<<<< HEAD
IF
(
BUILD_SHARED_LIBS
)
SET
(
CPP_BUILT_AS_DYNAMIC_LIB 1
)
ENDIF
()
||||||| merged common ancestors
IF
(
BUILD_SHARED_LIBS
)
SET
(
CPP_BUILT_AS_DYNAMIC_LIB 1
)
ENDIF
(
BUILD_SHARED_LIBS
)
=======
if
(
BUILD_SHARED_LIBS
)
set
(
CPP_BUILT_AS_DYNAMIC_LIB 1
)
else
(
BUILD_SHARED_LIBS
)
set
(
CPP_BUILT_AS_STATIC_LIB 1
)
endif
(
BUILD_SHARED_LIBS
)
>>>>>>> hdf5-upstream
#-----------------------------------------------------------------------------
# Generate configure file
...
...
@@ -46,55 +31,23 @@ INCLUDE_DIRECTORIES (${HDF5_BINARY_DIR})
#-----------------------------------------------------------------------------
# Parallel/MPI, prevent spurious cpp/cxx warnings
#-----------------------------------------------------------------------------
<<<<<<< HEAD
IF
(
H5_HAVE_PARALLEL
)
ADD_DEFINITIONS
(
"-DMPICH_SKIP_MPICXX"
)
ADD_DEFINITIONS
(
"-DMPICH_IGNORE_CXX_SEEK"
)
ENDIF
()
||||||| merged common ancestors
IF
(
H5_HAVE_PARALLEL
)
ADD_DEFINITIONS
(
"-DMPICH_SKIP_MPICXX"
)
ADD_DEFINITIONS
(
"-DMPICH_IGNORE_CXX_SEEK"
)
ENDIF
(
H5_HAVE_PARALLEL
)
=======
if
(
H5_HAVE_PARALLEL
)
add_definitions
(
"-DMPICH_SKIP_MPICXX"
)
add_definitions
(
"-DMPICH_IGNORE_CXX_SEEK"
)
endif
(
H5_HAVE_PARALLEL
)
>>>>>>> hdf5-upstream
add_subdirectory
(
${
HDF5_CPP_SOURCE_DIR
}
/src
${
HDF5_CPP_BINARY_DIR
}
/src
)
#-----------------------------------------------------------------------------
# Build the CPP Examples
#-----------------------------------------------------------------------------
<<<<<<< HEAD
IF
(
HDF5_BUILD_EXAMPLES
)
ADD_SUBDIRECTORY
(
${
HDF5_CPP_SOURCE_DIR
}
/examples
${
HDF5_CPP_BINARY_DIR
}
/examples
)
ENDIF
()
||||||| merged common ancestors
IF
(
HDF5_BUILD_EXAMPLES
)
ADD_SUBDIRECTORY
(
${
HDF5_CPP_SOURCE_DIR
}
/examples
${
HDF5_CPP_BINARY_DIR
}
/examples
)
ENDIF
(
HDF5_BUILD_EXAMPLES
)
=======
if
(
HDF5_BUILD_EXAMPLES
)
add_subdirectory
(
${
HDF5_CPP_SOURCE_DIR
}
/examples
${
HDF5_CPP_BINARY_DIR
}
/examples
)
endif
(
HDF5_BUILD_EXAMPLES
)
>>>>>>> hdf5-upstream
#-----------------------------------------------------------------------------
# Build the CPP unit tests
#-----------------------------------------------------------------------------
<<<<<<< HEAD
IF
(
BUILD_TESTING
)
ADD_SUBDIRECTORY
(
${
HDF5_CPP_SOURCE_DIR
}
/test
${
HDF5_CPP_BINARY_DIR
}
/test
)
ENDIF
()
||||||| merged common ancestors
IF
(
BUILD_TESTING
)
ADD_SUBDIRECTORY
(
${
HDF5_CPP_SOURCE_DIR
}
/test
${
HDF5_CPP_BINARY_DIR
}
/test
)
ENDIF
(
BUILD_TESTING
)
=======
if
(
BUILD_TESTING
)
add_subdirectory
(
${
HDF5_CPP_SOURCE_DIR
}
/test
${
HDF5_CPP_BINARY_DIR
}
/test
)
endif
(
BUILD_TESTING
)
>>>>>>> hdf5-upstream
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment