From 48a39270caa32d6e28ea12c5630db34bbf3627ef Mon Sep 17 00:00:00 2001 From: ana Date: Wed, 14 Oct 2015 12:23:20 +0300 Subject: [PATCH] Win32 compatibility with hdf5-1.8.14 --- salome_adm/cmake_files/FindSalomeHDF5.cmake | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/salome_adm/cmake_files/FindSalomeHDF5.cmake b/salome_adm/cmake_files/FindSalomeHDF5.cmake index ba55ec615..9f4671030 100644 --- a/salome_adm/cmake_files/FindSalomeHDF5.cmake +++ b/salome_adm/cmake_files/FindSalomeHDF5.cmake @@ -29,12 +29,6 @@ SET(HDF5_ROOT_DIR $ENV{HDF5_ROOT_DIR} CACHE PATH "Path to the HDF5.") -if(WIN32) - set(PREV_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) - set(CMAKE_FIND_LIBRARY_SUFFIXES dll${CMAKE_IMPORT_LIBRARY_SUFFIX}) - set(CMAKE_LIBRARY_PATH ${HDF5_ROOT_DIR}/dll) -endif() - SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(HDF5 HDF5_INCLUDE_DIR 1) MARK_AS_ADVANCED(FORCE HDF5_INCLUDE_DIR HDF5_LIB HDF5_DIR) @@ -83,10 +77,6 @@ IF(HDF5_IS_PARALLEL AND NOT SALOME_USE_MPI) MESSAGE(FATAL_ERROR "HDF5 is compiled with MPI, you have to set SALOME_USE_MPI to ON") ENDIF() -if(WIN32) - set(CMAKE_FIND_LIBRARY_SUFFIXES ${PREV_CMAKE_FIND_LIBRARY_SUFFIXES}) -endif() - IF(HDF5_FOUND) SALOME_ACCUMULATE_HEADERS(HDF5_INCLUDE_DIRS) SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${HDF5_LIBRARIES}) -- 2.39.2