summaryrefslogtreecommitdiffstats
path: root/c++/src
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2020-09-25 21:43:57 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2020-09-25 21:43:57 (GMT)
commitff0881f35ba3de1077b168dd5383e487081a23bb (patch)
tree4960ddb7db6ee0297f5f5371af3b0ee6315f42a4 /c++/src
parentaa08db839e6aea89487be985704d57a0e424b21b (diff)
downloadhdf5-ff0881f35ba3de1077b168dd5383e487081a23bb.zip
hdf5-ff0881f35ba3de1077b168dd5383e487081a23bb.tar.gz
hdf5-ff0881f35ba3de1077b168dd5383e487081a23bb.tar.bz2
OESS-98 merge with clang-format changes
Diffstat (limited to 'c++/src')
-rw-r--r--c++/src/CMakeLists.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt
index 0b4473f..04822cf 100644
--- a/c++/src/CMakeLists.txt
+++ b/c++/src/CMakeLists.txt
@@ -5,7 +5,7 @@ project (HDF5_CPP_SRC CXX)
# Generate configure file
#-----------------------------------------------------------------------------
configure_file (${HDF_RESOURCES_DIR}/H5cxx_config.h.in
- ${HDF5_BINARY_DIR}/H5cxx_pubconf.h
+ ${HDF5_SRC_BINARY_DIR}/H5cxx_pubconf.h
)
#-----------------------------------------------------------------------------
@@ -87,7 +87,7 @@ set (CPP_HDRS
if (NOT ONLY_SHARED_LIBS)
add_library (${HDF5_CPP_LIB_TARGET} STATIC ${CPP_SOURCES} ${CPP_HDRS})
target_include_directories (${HDF5_CPP_LIB_TARGET}
- PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
+ PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
)
target_compile_options(${HDF5_CPP_LIB_TARGET} PRIVATE "${HDF5_CMAKE_CXX_FLAGS}")
@@ -105,7 +105,7 @@ endif ()
if (BUILD_SHARED_LIBS)
add_library (${HDF5_CPP_LIBSH_TARGET} SHARED ${CPP_SOURCES} ${CPP_HDRS})
target_include_directories (${HDF5_CPP_LIBSH_TARGET}
- PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
+ PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
)
target_compile_options(${HDF5_CPP_LIBSH_TARGET} PRIVATE "${HDF5_CMAKE_CXX_FLAGS}")