From: rnv <rnv@opencascade.com>
Date: Wed, 30 Oct 2013 12:39:43 +0000 (+0000)
Subject: Win32 building.
X-Git-Tag: BR_hydro_v_0_3_1~44
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3d7c1b61234d497e0ed196f1d743c91e5aa6b683;p=modules%2Fkernel.git

Win32 building.
---

diff --git a/salome_adm/cmake_files/FindSalomeHDF5.cmake b/salome_adm/cmake_files/FindSalomeHDF5.cmake
index de7dc234d..367755ca5 100644
--- a/salome_adm/cmake_files/FindSalomeHDF5.cmake
+++ b/salome_adm/cmake_files/FindSalomeHDF5.cmake
@@ -27,9 +27,12 @@
 #  MPI root directory used for HDF5 compilation is exposed into MPI_ROOT_DIR_EXP
 #
 
+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)
diff --git a/salome_adm/cmake_files/FindSphinx.cmake b/salome_adm/cmake_files/FindSphinx.cmake
index 8e05c7a73..f06933ab1 100644
--- a/salome_adm/cmake_files/FindSphinx.cmake
+++ b/salome_adm/cmake_files/FindSphinx.cmake
@@ -30,7 +30,7 @@
 #
 ###########################################################################
 
-FIND_PROGRAM(SPHINX_EXECUTABLE sphinx-build)
+FIND_PROGRAM(SPHINX_EXECUTABLE sphinx-build PATH_SUFFIXES Scripts)
 
 # Handle the standard arguments of the find_package() command:
 INCLUDE(FindPackageHandleStandardArgs)