diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2014-05-12 18:14:46 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2014-05-12 18:14:46 (GMT) |
| commit | 8f57e86ab9f53cb1770054e69784087695ac14af (patch) | |
| tree | 967f24a44d36cb67737a0330f63147bc2bf9fd7d /tools | |
| parent | 22f96446703b06a893ae75217add9f7c2f9edee4 (diff) | |
| download | hdf5-8f57e86ab9f53cb1770054e69784087695ac14af.zip hdf5-8f57e86ab9f53cb1770054e69784087695ac14af.tar.gz hdf5-8f57e86ab9f53cb1770054e69784087695ac14af.tar.bz2 | |
[svn-r25185] update cmake command name case
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/h5dump/CMakeTests.cmake | 6 | ||||
| -rw-r--r-- | tools/lib/CMakeLists.txt | 15 |
2 files changed, 3 insertions, 18 deletions
diff --git a/tools/h5dump/CMakeTests.cmake b/tools/h5dump/CMakeTests.cmake index fb7022c..3174e34 100644 --- a/tools/h5dump/CMakeTests.cmake +++ b/tools/h5dump/CMakeTests.cmake @@ -313,7 +313,7 @@ # copy test files from source dir to test dir # foreach (tst_h5_file ${HDF5_REFERENCE_TEST_FILES}) - GET_FILENAME_COMPONENT(fname "${tst_h5_file}" NAME) + get_filename_component (fname "${tst_h5_file}" NAME) set (dest "${PROJECT_BINARY_DIR}/testfiles/std/${fname}") #message (STATUS " Copying ${tst_h5_file}") add_custom_command ( @@ -339,7 +339,7 @@ endforeach (tst_exp_file ${HDF5_REFERENCE_EXP_FILES}) foreach (tst_other_file ${HDF5_REFERENCE_FILES}) - GET_FILENAME_COMPONENT(fname "${tst_other_file}" NAME) + get_filename_component (fname "${tst_other_file}" NAME) set (dest "${PROJECT_BINARY_DIR}/testfiles/std/${fname}") #message (STATUS " Copying ${tst_other_file}") add_custom_command ( @@ -351,7 +351,7 @@ endforeach (tst_other_file ${HDF5_REFERENCE_FILES}) foreach (tst_error_file ${HDF5_ERROR_REFERENCE_TEST_FILES}) - GET_FILENAME_COMPONENT(fname "${tst_error_file}" NAME) + get_filename_component (fname "${tst_error_file}" NAME) set (dest "${PROJECT_BINARY_DIR}/testfiles/std/${fname}") #message (STATUS " Copying ${tst_error_file}") add_custom_command ( diff --git a/tools/lib/CMakeLists.txt b/tools/lib/CMakeLists.txt index c3b8294..52749b0 100644 --- a/tools/lib/CMakeLists.txt +++ b/tools/lib/CMakeLists.txt @@ -71,21 +71,6 @@ install ( ) #----------------------------------------------------------------------------- -# Because tools are installed into bin/tools we need to make sure the hdf5tools -# library will be installed into the proper location. -#----------------------------------------------------------------------------- -if (APPLE) - option (HDF5_BUILD_WITH_INSTALL_NAME "Build with library install_name set to the installation path" OFF) - if (HDF5_BUILD_WITH_INSTALL_NAME) - SET_TARGET_PROPERTIES(${HDF5_TOOLS_LIB_TARGET} PROPERTIES - LINK_FLAGS "-current_version ${HDF5_PACKAGE_VERSION} -compatibility_version ${HDF5_PACKAGE_VERSION}" - INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" - BUILD_WITH_INSTALL_RPATH ${HDF5_BUILD_WITH_INSTALL_NAME} - ) - endif (HDF5_BUILD_WITH_INSTALL_NAME) -endif (APPLE) - -#----------------------------------------------------------------------------- # Add Target(s) to CMake Install for import into other projects #----------------------------------------------------------------------------- if (HDF5_EXPORTED_TARGETS) |