diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2013-08-26 15:35:15 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2013-08-26 15:35:15 (GMT) |
| commit | 8194f34ef79a58dc5e57b374873be4e50ad7ad7b (patch) | |
| tree | 876b1d75477a2babe7fd8a7ef555611825e52526 /hl/c++ | |
| parent | a17e786cd732ca3af91ebb473a0bd116f391c94a (diff) | |
| download | hdf5-8194f34ef79a58dc5e57b374873be4e50ad7ad7b.zip hdf5-8194f34ef79a58dc5e57b374873be4e50ad7ad7b.tar.gz hdf5-8194f34ef79a58dc5e57b374873be4e50ad7ad7b.tar.bz2 | |
[svn-r24072] Merge trunk cmake changes to 1.8 branch.
Also add default switch blocks to h5import.
Merge h5dump any_path option from trunk.
Tested: local linux
Diffstat (limited to 'hl/c++')
| -rw-r--r-- | hl/c++/examples/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | hl/c++/examples/CMakeTests.cmake | 8 | ||||
| -rw-r--r-- | hl/c++/test/CMakeLists.txt | 36 | ||||
| -rw-r--r-- | hl/c++/test/CMakeTests.cmake | 8 |
4 files changed, 34 insertions, 20 deletions
diff --git a/hl/c++/examples/CMakeLists.txt b/hl/c++/examples/CMakeLists.txt index aa4221f..f762839 100644 --- a/hl/c++/examples/CMakeLists.txt +++ b/hl/c++/examples/CMakeLists.txt @@ -22,5 +22,5 @@ TARGET_LINK_LIBRARIES ( SET_TARGET_PROPERTIES (ptExampleFL PROPERTIES FOLDER examples/hl/cpp) IF (BUILD_TESTING) - ADD_TEST (NAME cpp_hl_ex_ptExampleFL COMMAND $<TARGET_FILE:ptExampleFL>) + INCLUDE (CMakeTests.cmake) ENDIF (BUILD_TESTING) diff --git a/hl/c++/examples/CMakeTests.cmake b/hl/c++/examples/CMakeTests.cmake new file mode 100644 index 0000000..95cc8b4 --- /dev/null +++ b/hl/c++/examples/CMakeTests.cmake @@ -0,0 +1,8 @@ + +############################################################################## +############################################################################## +### T E S T I N G ### +############################################################################## +############################################################################## + +ADD_TEST (NAME cpp_hl_ex_ptExampleFL COMMAND $<TARGET_FILE:ptExampleFL>) diff --git a/hl/c++/test/CMakeLists.txt b/hl/c++/test/CMakeLists.txt index 6633426..46229ba 100644 --- a/hl/c++/test/CMakeLists.txt +++ b/hl/c++/test/CMakeLists.txt @@ -11,23 +11,21 @@ INCLUDE_DIRECTORIES (${HDF5_HL_SRC_DIR}/c++/src) # Add in the unit tests for the packet table c++ wrapper # -------------------------------------------------------------------- -IF (BUILD_TESTING) - INCLUDE_DIRECTORIES (${HDF5_TEST_SRC_DIR}) - INCLUDE_DIRECTORIES (${HDF5_HL_SRC_DIR}/test) - INCLUDE_DIRECTORIES (${HDF5_CPP_SRC_DIR}/src) +INCLUDE_DIRECTORIES (${HDF5_TEST_SRC_DIR}) +INCLUDE_DIRECTORIES (${HDF5_HL_SRC_DIR}/test) +INCLUDE_DIRECTORIES (${HDF5_CPP_SRC_DIR}/src) - ADD_EXECUTABLE (hl_ptableTest ${HDF5_HL_CPP_TEST_SOURCE_DIR}/ptableTest.cpp) - TARGET_C_PROPERTIES (hl_ptableTest " " " ") - TARGET_NAMING (hl_ptableTest ${LIB_TYPE}) - TARGET_LINK_LIBRARIES ( - hl_ptableTest - ${HDF5_LIB_TARGET} - ${HDF5_TEST_LIB_TARGET} - ${HDF5_CPP_LIB_TARGET} - ${HDF5_HL_LIB_TARGET} - ${HDF5_HL_CPP_LIB_TARGET} - ) - SET_TARGET_PROPERTIES (hl_ptableTest PROPERTIES FOLDER test/hl/cpp) - - ADD_TEST (NAME hl_ptableTest COMMAND $<TARGET_FILE:hl_ptableTest>) -ENDIF (BUILD_TESTING) +ADD_EXECUTABLE (hl_ptableTest ${HDF5_HL_CPP_TEST_SOURCE_DIR}/ptableTest.cpp) +TARGET_C_PROPERTIES (hl_ptableTest " " " ") +TARGET_NAMING (hl_ptableTest ${LIB_TYPE}) +TARGET_LINK_LIBRARIES ( + hl_ptableTest + ${HDF5_LIB_TARGET} + ${HDF5_TEST_LIB_TARGET} + ${HDF5_CPP_LIB_TARGET} + ${HDF5_HL_LIB_TARGET} + ${HDF5_HL_CPP_LIB_TARGET} +) +SET_TARGET_PROPERTIES (hl_ptableTest PROPERTIES FOLDER test/hl/cpp) + +INCLUDE (CMakeTests.cmake) diff --git a/hl/c++/test/CMakeTests.cmake b/hl/c++/test/CMakeTests.cmake new file mode 100644 index 0000000..cb9454b --- /dev/null +++ b/hl/c++/test/CMakeTests.cmake @@ -0,0 +1,8 @@ + +############################################################################## +############################################################################## +### T E S T I N G ### +############################################################################## +############################################################################## + + ADD_TEST (NAME hl_ptableTest COMMAND $<TARGET_FILE:hl_ptableTest>) |