From: inv <inv@opencascade.com>
Date: Thu, 19 Sep 2013 17:16:44 +0000 (+0000)
Subject: Synchronize adm files
X-Git-Tag: V7_3_0a1~137
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=44c10ff2f428d1be7ceb81d8e074b15edc1a19df;p=modules%2Fmed.git

Synchronize adm files
---

diff --git a/adm_local_without_kernel/cmake_files/FindSalomeHDF5.cmake b/adm_local_without_kernel/cmake_files/FindSalomeHDF5.cmake
index d607ef7df..9b25dbeb2 100644
--- a/adm_local_without_kernel/cmake_files/FindSalomeHDF5.cmake
+++ b/adm_local_without_kernel/cmake_files/FindSalomeHDF5.cmake
@@ -27,10 +27,10 @@
 #  MPI root directory used for HDF5 compilation is exposed into MPI_ROOT_DIR_EXP
 #
 
-if(WINDOWS)
+if(WIN32)
   set(PREV_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
   set(CMAKE_FIND_LIBRARY_SUFFIXES dll${CMAKE_IMPORT_LIBRARY_SUFFIX})
-endif(WINDOWS)
+endif()
 
 SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(HDF5 HDF5_INCLUDE_DIR 1)
 MARK_AS_ADVANCED(FORCE HDF5_INCLUDE_DIR HDF5_LIB HDF5_DIR)
@@ -80,6 +80,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(WINDOWS)
+if(WIN32)
   set(CMAKE_FIND_LIBRARY_SUFFIXES ${PREV_CMAKE_FIND_LIBRARY_SUFFIXES})
-endif(WINDOWS)
+endif()
diff --git a/adm_local_without_kernel/cmake_files/FindSalomePython.cmake b/adm_local_without_kernel/cmake_files/FindSalomePython.cmake
index d7e2ba824..26b86dcf7 100644
--- a/adm_local_without_kernel/cmake_files/FindSalomePython.cmake
+++ b/adm_local_without_kernel/cmake_files/FindSalomePython.cmake
@@ -45,12 +45,12 @@ ENDIF()
 SET(PYTHON_ROOT_DIR "${_dflt_value}" CACHE PATH "Path to Python directory (interpreter and libs)")
 
 # 2. Find package - config mode first (i.e. looking for XYZ-config.cmake)
-IF(WINDOWS)
+IF(WIN32)
  IF(CMAKE_BUILD_TYPE STREQUAL Debug)
   SET(PythonInterp_FIND_VERSION _d)
   SET(PYTHON_DEFINITIONS "-DHAVE_DEBUG_PYTHON")
  ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
-ENDIF(WINDOWS)
+ENDIF(WIN32)
 IF(EXISTS "${PYTHON_ROOT_DIR}")
   # Hope to find direclty a CMake config file there
   SET(_CONF_DIR "${PYTHON_ROOT_DIR}/share/cmake")