summaryrefslogtreecommitdiffstats
path: root/c++
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2010-08-31 20:15:13 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2010-08-31 20:15:13 (GMT)
commite65aa8c36566febd00da128e64cc90f3c8ffbc70 (patch)
tree1c52c1ccdf6b28b73702da3b49bad78f5414b33c /c++
parentb8d1216dcac1b773f9a7f757ee4dca67547dc082 (diff)
downloadhdf5-e65aa8c36566febd00da128e64cc90f3c8ffbc70.zip
hdf5-e65aa8c36566febd00da128e64cc90f3c8ffbc70.tar.gz
hdf5-e65aa8c36566febd00da128e64cc90f3c8ffbc70.tar.bz2
[svn-r19325] Added parallel build commands.
Corrected use/name of source folder aliases. Duplicated FindMPI.cmake so that non-c++ compiler is found first (recommemded commands did not work). Tested: local linux with mpich
Diffstat (limited to 'c++')
-rw-r--r--c++/src/CMakeLists.txt114
-rw-r--r--c++/test/CMakeLists.txt5
2 files changed, 59 insertions, 60 deletions
diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt
index fee9a6a..4c6dd5f 100644
--- a/c++/src/CMakeLists.txt
+++ b/c++/src/CMakeLists.txt
@@ -19,66 +19,66 @@ CONFIGURE_FILE (${HDF5_RESOURCES_DIR}/H5cxx_config.h.in
# Define cpp Library
#-----------------------------------------------------------------------------
SET (CPP_SRCS
- ${HDF5_CPP_SOURCE_DIR}/src/H5AbstractDs.cpp
- ${HDF5_CPP_SOURCE_DIR}/src/H5ArrayType.cpp
- ${HDF5_CPP_SOURCE_DIR}/src/H5AtomType.cpp
- ${HDF5_CPP_SOURCE_DIR}/src/H5Attribute.cpp
- ${HDF5_CPP_SOURCE_DIR}/src/H5CommonFG.cpp
- ${HDF5_CPP_SOURCE_DIR}/src/H5CompType.cpp
- ${HDF5_CPP_SOURCE_DIR}/src/H5DataSet.cpp
- ${HDF5_CPP_SOURCE_DIR}/src/H5DataSpace.cpp
- ${HDF5_CPP_SOURCE_DIR}/src/H5DataType.cpp
- ${HDF5_CPP_SOURCE_DIR}/src/H5DcreatProp.cpp
- ${HDF5_CPP_SOURCE_DIR}/src/H5DxferProp.cpp
- ${HDF5_CPP_SOURCE_DIR}/src/H5EnumType.cpp
- ${HDF5_CPP_SOURCE_DIR}/src/H5Exception.cpp
- ${HDF5_CPP_SOURCE_DIR}/src/H5FaccProp.cpp
- ${HDF5_CPP_SOURCE_DIR}/src/H5FcreatProp.cpp
- ${HDF5_CPP_SOURCE_DIR}/src/H5File.cpp
- ${HDF5_CPP_SOURCE_DIR}/src/H5FloatType.cpp
- ${HDF5_CPP_SOURCE_DIR}/src/H5Group.cpp
- ${HDF5_CPP_SOURCE_DIR}/src/H5IdComponent.cpp
- ${HDF5_CPP_SOURCE_DIR}/src/H5IntType.cpp
- ${HDF5_CPP_SOURCE_DIR}/src/H5Library.cpp
- ${HDF5_CPP_SOURCE_DIR}/src/H5Object.cpp
- ${HDF5_CPP_SOURCE_DIR}/src/H5PredType.cpp
- ${HDF5_CPP_SOURCE_DIR}/src/H5PropList.cpp
- ${HDF5_CPP_SOURCE_DIR}/src/H5StrType.cpp
- ${HDF5_CPP_SOURCE_DIR}/src/H5VarLenType.cpp
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5AbstractDs.cpp
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5ArrayType.cpp
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5AtomType.cpp
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5Attribute.cpp
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5CommonFG.cpp
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5CompType.cpp
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5DataSet.cpp
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5DataSpace.cpp
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5DataType.cpp
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5DcreatProp.cpp
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5DxferProp.cpp
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5EnumType.cpp
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5Exception.cpp
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5FaccProp.cpp
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5FcreatProp.cpp
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5File.cpp
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5FloatType.cpp
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5Group.cpp
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5IdComponent.cpp
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5IntType.cpp
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5Library.cpp
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5Object.cpp
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5PredType.cpp
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5PropList.cpp
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5StrType.cpp
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5VarLenType.cpp
)
SET (CPP_HDRS
- ${HDF5_CPP_SOURCE_DIR}/src/H5AbstractDs.h
- ${HDF5_CPP_SOURCE_DIR}/src/H5Alltypes.h
- ${HDF5_CPP_SOURCE_DIR}/src/H5ArrayType.h
- ${HDF5_CPP_SOURCE_DIR}/src/H5AtomType.h
- ${HDF5_CPP_SOURCE_DIR}/src/H5Attribute.h
- ${HDF5_CPP_SOURCE_DIR}/src/H5Classes.h
- ${HDF5_CPP_SOURCE_DIR}/src/H5CommonFG.h
- ${HDF5_CPP_SOURCE_DIR}/src/H5CompType.h
- ${HDF5_CPP_SOURCE_DIR}/src/H5Cpp.h
- ${HDF5_CPP_SOURCE_DIR}/src/H5CppDoc.h
- ${HDF5_CPP_SOURCE_DIR}/src/H5DataSet.h
- ${HDF5_CPP_SOURCE_DIR}/src/H5DataSpace.h
- ${HDF5_CPP_SOURCE_DIR}/src/H5DataType.h
- ${HDF5_CPP_SOURCE_DIR}/src/H5DcreatProp.h
- ${HDF5_CPP_SOURCE_DIR}/src/H5DxferProp.h
- ${HDF5_CPP_SOURCE_DIR}/src/H5EnumType.h
- ${HDF5_CPP_SOURCE_DIR}/src/H5Exception.h
- ${HDF5_CPP_SOURCE_DIR}/src/H5FaccProp.h
- ${HDF5_CPP_SOURCE_DIR}/src/H5FcreatProp.h
- ${HDF5_CPP_SOURCE_DIR}/src/H5File.h
- ${HDF5_CPP_SOURCE_DIR}/src/H5FloatType.h
- ${HDF5_CPP_SOURCE_DIR}/src/H5Group.h
- ${HDF5_CPP_SOURCE_DIR}/src/H5IdComponent.h
- ${HDF5_CPP_SOURCE_DIR}/src/H5Include.h
- ${HDF5_CPP_SOURCE_DIR}/src/H5IntType.h
- ${HDF5_CPP_SOURCE_DIR}/src/H5Library.h
- ${HDF5_CPP_SOURCE_DIR}/src/H5Object.h
- ${HDF5_CPP_SOURCE_DIR}/src/H5PredType.h
- ${HDF5_CPP_SOURCE_DIR}/src/H5PropList.h
- ${HDF5_CPP_SOURCE_DIR}/src/H5StrType.h
- ${HDF5_CPP_SOURCE_DIR}/src/H5VarLenType.h
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5AbstractDs.h
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5Alltypes.h
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5ArrayType.h
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5AtomType.h
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5Attribute.h
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5Classes.h
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5CommonFG.h
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5CompType.h
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5Cpp.h
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5CppDoc.h
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5DataSet.h
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5DataSpace.h
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5DataType.h
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5DcreatProp.h
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5DxferProp.h
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5EnumType.h
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5Exception.h
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5FaccProp.h
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5FcreatProp.h
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5File.h
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5FloatType.h
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5Group.h
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5IdComponent.h
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5Include.h
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5IntType.h
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5Library.h
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5Object.h
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5PredType.h
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5PropList.h
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5StrType.h
+ ${HDF5_CPP_SRC_SOURCE_DIR}/H5VarLenType.h
)
ADD_LIBRARY (${HDF5_CPP_LIB_TARGET} ${LIB_TYPE} ${CPP_SRCS} ${CPP_HDRS})
diff --git a/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt
index 770348e..722bd37 100644
--- a/c++/test/CMakeLists.txt
+++ b/c++/test/CMakeLists.txt
@@ -1,4 +1,5 @@
cmake_minimum_required (VERSION 2.8)
+PROJECT (HDF5_CPP_TEST)
# --------------------------------------------------------------------
# Notes: When creating unit test executables they should be prefixed
# with "cpp_". This allows for easier filtering of the test suite when
@@ -7,8 +8,6 @@ cmake_minimum_required (VERSION 2.8)
# which would only run the C++ based unit tests.
# --------------------------------------------------------------------
-PROJECT (HDF5_CPP_TEST)
-
#-----------------------------------------------------------------------------
# Define Sources
#-----------------------------------------------------------------------------
@@ -34,7 +33,7 @@ SET (srcdir ${CMAKE_CURRENT_SOURCE_DIR})
CONFIGURE_FILE (${HDF5_CPP_TEST_SOURCE_DIR}/H5srcdir_str.h.in H5srcdir_str.h @ONLY)
INCLUDE_DIRECTORIES (${CMAKE_CURRENT_BINARY_DIR})
-INCLUDE_DIRECTORIES (${HDF5_TEST_SOURCE_DIR} )
+INCLUDE_DIRECTORIES (${HDF5_TEST_SRC_DIR} )
ADD_EXECUTABLE (cpp_testhdf5 ${CPP_TEST_SRCS} )
H5_NAMING (cpp_testhdf5)