From: rnv <rnv@opencascade.com>
Date: Mon, 24 Jun 2013 10:43:48 +0000 (+0000)
Subject: Preparation of the SALOME7.2.0 win32 version.
X-Git-Tag: V7_2_0_WIN~7
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=adcc54bc07e1fb4263395ab0f9fd33d35e011dce;p=modules%2Fkernel.git

Preparation of the SALOME7.2.0 win32 version.
---

diff --git a/salome_adm/cmake_files/deprecated/FindBOOST.cmake b/salome_adm/cmake_files/deprecated/FindBOOST.cmake
index fff9d21a1..f297de98a 100644
--- a/salome_adm/cmake_files/deprecated/FindBOOST.cmake
+++ b/salome_adm/cmake_files/deprecated/FindBOOST.cmake
@@ -26,6 +26,8 @@ MESSAGE(STATUS "Check for boost ...")
 
 # ------
 
+SET (boost_versions 1_35 1_38 1_42 1_46_1 1_49 1_52)
+
 IF(BOOST_IS_MANDATORY STREQUAL 0)
   SET(BOOST_IS_MANDATORY 0)
   SET(BOOST_IS_OPTIONAL 1)
@@ -74,7 +76,10 @@ ENDIF(BOOST_STATUS)
 
 IF(BOOST_STATUS)
   IF(BOOST_ROOT_USER)
-    SET(BOOST_INCLUDE_PATHS ${BOOST_ROOT_USER} ${BOOST_ROOT_USER}/include)
+    SET(BOOST_INCLUDE_PATHS ${BOOST_ROOT_USER} ${BOOST_ROOT_USER}/include )
+    FOREACH(version ${boost_versions})
+     SET(BOOST_INCLUDE_PATHS ${BOOST_INCLUDE_PATHS} ${BOOST_ROOT_USER}/include/boost-${version} )
+    ENDFOREACH(version ${boost_versions})
   ELSE(BOOST_ROOT_USER)
     SET(BOOST_INCLUDE_PATHS)
   ENDIF(BOOST_ROOT_USER)
@@ -114,7 +119,7 @@ ENDIF(WINDOWS)
   
 IF(BOOST_STATUS)
   SET(BOOST_LIBS)
-  FOREACH(name thread date_time signals filesystem system regex)
+  FOREACH(name thread date_time signals filesystem system regex chrono)
     IF(WINDOWS)
       IF(CMAKE_BUILD_TYPE STREQUAL Debug)
         SET(EXTENSION -gd)
@@ -123,10 +128,10 @@ IF(BOOST_STATUS)
       ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
       SET(LIB_NAMES)
       SET(STATIC_LIB_NAMES)      
-      FOREACH(version 1_35 1_38 1_42 1_46_1 1_49)
+      FOREACH(version ${boost_versions})
         SET(LIB_NAMES ${LIB_NAMES} boost_${name}-vc90-mt${EXTENSION}-${version})
         SET(STATIC_LIB_NAMES ${STATIC_LIB_NAMES} libboost_${name}-vc90-mt${EXTENSION}-${version})
-      ENDFOREACH(version 1_35 1_38 1_42 1_46_1 1_49)
+      ENDFOREACH(version ${boost_versions})
       FIND_LIBRARY(BOOST_LIB_${name} NAMES ${LIB_NAMES} PATHS ${BOOST_LIB_PATHS} ${BOOST_FIND_PATHS_OPTION})
       SET(BOOST_LIB_${name}_FOUNDED ${BOOST_LIB_${name}})
       IF(NOT BOOST_LIB_${name})