diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2014-05-27 17:46:30 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2014-05-27 17:46:30 (GMT) |
| commit | 5278b9737dad788a99cd44186b309e402c311139 (patch) | |
| tree | b2f58888b58a5315e56affefd0cdc866ccf44aca /tools/lib | |
| parent | fea439b440b85f9ed97aeb01a64b44fdbacac047 (diff) | |
| download | hdf5-5278b9737dad788a99cd44186b309e402c311139.zip hdf5-5278b9737dad788a99cd44186b309e402c311139.tar.gz hdf5-5278b9737dad788a99cd44186b309e402c311139.tar.bz2 | |
[svn-r25222] Merge cmake_ext_mod into 1.8
Diffstat (limited to 'tools/lib')
| -rw-r--r-- | tools/lib/CMakeLists.txt | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/tools/lib/CMakeLists.txt b/tools/lib/CMakeLists.txt index c3b8294..e65673a 100644 --- a/tools/lib/CMakeLists.txt +++ b/tools/lib/CMakeLists.txt @@ -4,7 +4,7 @@ PROJECT (HDF5_TOOLS_LIB) #----------------------------------------------------------------------------- # Apply Definitions to compiler in this directory and below #----------------------------------------------------------------------------- -add_definitions (${HDF5_EXTRA_C_FLAGS}) +add_definitions (${HDF_EXTRA_C_FLAGS}) #----------------------------------------------------------------------------- # Define Sources @@ -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) |