diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2011-02-25 14:33:50 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2011-02-25 14:33:50 (GMT) |
| commit | 7eb98436fc764180a73275b8ff387946b87ffc72 (patch) | |
| tree | 4919fab80ce46d7cc545546bb9c89452b4c27362 /hl/c++ | |
| parent | 3d75165304907c5de3372497d1e19c97df1498ab (diff) | |
| download | hdf5-7eb98436fc764180a73275b8ff387946b87ffc72.zip hdf5-7eb98436fc764180a73275b8ff387946b87ffc72.tar.gz hdf5-7eb98436fc764180a73275b8ff387946b87ffc72.tar.bz2 | |
[svn-r20157] Bring CMake changes to branch up to r20156 from trunk
Diffstat (limited to 'hl/c++')
| -rw-r--r-- | hl/c++/examples/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | hl/c++/test/CMakeLists.txt | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/hl/c++/examples/CMakeLists.txt b/hl/c++/examples/CMakeLists.txt index 9b86027..f396523 100644 --- a/hl/c++/examples/CMakeLists.txt +++ b/hl/c++/examples/CMakeLists.txt @@ -11,7 +11,7 @@ INCLUDE_DIRECTORIES (${HDF5_HL_CPP_SRC_DIR}/src) # Add in the examples for the Packet Table codes # -------------------------------------------------------------------- ADD_EXECUTABLE (ptExampleFL ${HDF5_HL_CPP_EXAMPLES_SOURCE_DIR}/ptExampleFL.cpp) -H5_NAMING (ptExampleFL ${LIB_TYPE}) +TARGET_NAMING (ptExampleFL ${LIB_TYPE}) TARGET_LINK_LIBRARIES ( ptExampleFL ${HDF5_HL_CPP_LIB_TARGET} @@ -20,7 +20,7 @@ TARGET_LINK_LIBRARIES ( ) ADD_EXECUTABLE (ptExampleVL ${HDF5_HL_CPP_EXAMPLES_SOURCE_DIR}/ptExampleVL.cpp) -H5_NAMING (ptExampleVL ${LIB_TYPE}) +TARGET_NAMING (ptExampleVL ${LIB_TYPE}) TARGET_LINK_LIBRARIES ( ptExampleVL ${HDF5_HL_CPP_LIB_TARGET} diff --git a/hl/c++/test/CMakeLists.txt b/hl/c++/test/CMakeLists.txt index c7fb793..7fc3418 100644 --- a/hl/c++/test/CMakeLists.txt +++ b/hl/c++/test/CMakeLists.txt @@ -17,7 +17,7 @@ IF (BUILD_TESTING) INCLUDE_DIRECTORIES (${HDF5_CPP_SRC_DIR}/src) ADD_EXECUTABLE (hl_ptableTest ${HDF5_HL_CPP_TEST_SOURCE_DIR}/ptableTest.cpp) - H5_NAMING (hl_ptableTest ${LIB_TYPE}) + TARGET_NAMING (hl_ptableTest ${LIB_TYPE}) TARGET_LINK_LIBRARIES ( hl_ptableTest ${HDF5_LIB_TARGET} @@ -26,8 +26,6 @@ IF (BUILD_TESTING) ${HDF5_HL_LIB_TARGET} ${HDF5_HL_CPP_LIB_TARGET} ) - GET_TARGET_PROPERTY (hl_ptableTestpath hl_ptableTest LOCATION) - GET_FILENAME_COMPONENT (hl_ptableTestexe ${hl_ptableTestpath} NAME) ADD_TEST (NAME hl_ptableTest COMMAND $<TARGET_FILE:hl_ptableTest>) ENDIF (BUILD_TESTING) |