From: ana <ana@opencascade.com>
Date: Thu, 25 Aug 2016 16:18:49 +0000 (+0300)
Subject: Windows compatibility
X-Git-Tag: V8_1_0rc2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a1d32ed95c62f79327a7aa31d00a4940488aba2e;p=tools%2Fconfiguration.git

Windows compatibility
---

diff --git a/cmake/FindMESHGEMS.cmake b/cmake/FindMESHGEMS.cmake
index 9422b1f..40f8e3e 100644
--- a/cmake/FindMESHGEMS.cmake
+++ b/cmake/FindMESHGEMS.cmake
@@ -46,7 +46,7 @@ ELSE()
   SET(_suff)
 ENDIF(MACHINE_IS_64)
 IF(WIN32)	
-  SET(_plt WinXP${_suff}_VC9 WinXP${_suff}_VC10)
+  SET(_plt Win7${_suff}_VC9 Win7${_suff}_VC10 WinXP${_suff}_VC9 WinXP${_suff}_VC10)
 ELSE()
   SET(_plt Linux${_suff})
 ENDIF(WIN32)
@@ -60,15 +60,15 @@ FIND_LIBRARY(MESHGEMS_TETRA_LIBRARY      NAMES mg-tetra       PATH_SUFFIXES ${_p
 FIND_LIBRARY(MESHGEMS_TETRA_HPC_LIBRARY  NAMES mg-tetra_hpc   PATH_SUFFIXES ${_plt})
 
 # TODO: search all components
-IF(MESHGEMS_LIBRARY_meshgems)
-  SET(MESHGEMS_LIBRARY_meshgems  ${MESHGEMS_LIBRARY_meshgems}  ${MESHGEMS_LIB_meshgems_stubs})
+IF(MESHGEMS_LIB_meshgems)
+  SET(MESHGEMS_LIBRARY_meshgems  ${MESHGEMS_LIB_meshgems}  ${MESHGEMS_LIB_meshgems_stubs})
 
   SET(MESHGEMS_CADSURF_LIBRARY   ${MESHGEMS_CADSURF_LIBRARY}   ${MESHGEMS_LIBRARY_meshgems})
   SET(MESHGEMS_HEXA_LIBRARY      ${MESHGEMS_HEXA_LIBRARY}      ${MESHGEMS_LIBRARY_meshgems})
   SET(MESHGEMS_HYBRID_LIBRARY    ${MESHGEMS_HYBRID_LIBRARY}    ${MESHGEMS_LIBRARY_meshgems})
   SET(MESHGEMS_TETRA_LIBRARY     ${MESHGEMS_TETRA_LIBRARY}     ${MESHGEMS_LIBRARY_meshgems})
   SET(MESHGEMS_TETRA_HPC_LIBRARY ${MESHGEMS_TETRA_HPC_LIBRARY} ${MESHGEMS_LIBRARY_meshgems})
-ENDIF(MESHGEMS_LIBRARY_meshgems)
+ENDIF(MESHGEMS_LIB_meshgems)
 
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(MESHGEMS REQUIRED_VARS MESHGEMS_INCLUDE_DIRS MESHGEMS_CADSURF_LIBRARY MESHGEMS_HEXA_LIBRARY MESHGEMS_HYBRID_LIBRARY MESHGEMS_TETRA_LIBRARY MESHGEMS_TETRA_HPC_LIBRARY)