From: adam <adam>
Date: Tue, 12 May 2009 14:51:24 +0000 (+0000)
Subject: Compatibility boost 1.35 1.38
X-Git-Tag: V5_1_2rc1~31
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=78bb8e2cc371c645a531eeed5c01aeb1d29a5593;p=modules%2Fkernel.git

Compatibility boost 1.35 1.38
---

diff --git a/salome_adm/cmake_files/FindBOOST.cmake b/salome_adm/cmake_files/FindBOOST.cmake
index 581560ef7..d46eb032a 100644
--- a/salome_adm/cmake_files/FindBOOST.cmake
+++ b/salome_adm/cmake_files/FindBOOST.cmake
@@ -102,26 +102,28 @@ IF(BOOST_STATUS)
 ENDIF(BOOST_STATUS)
 
 IF(BOOST_STATUS)
+  SET(BOOST_LIBS)
   IF(WINDOWS)
     IF(CMAKE_BUILD_TYPE STREQUAL Debug)
       SET(EXTENSION -gd)
     ELSE(CMAKE_BUILD_TYPE STREQUAL Debug)
       SET(EXTENSION)
     ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
-    FIND_LIBRARY(BOOST_LIB_THREAD libboost_thread-vc90-mt${EXTENSION}-1_35 ${BOOST_LIB_PATHS})
-    FIND_LIBRARY(BOOST_LIB_DATE_TIME libboost_date_time-vc90-mt${EXTENSION}-1_35 ${BOOST_LIB_PATHS})
-    FIND_LIBRARY(BOOST_LIB_SIGNALS libboost_signals-vc90-mt${EXTENSION}-1_35 ${BOOST_LIB_PATHS})
-    FIND_LIBRARY(BOOST_LIB_FILESYSTEM libboost_filesystem-vc90-mt${EXTENSION}-1_35 ${BOOST_LIB_PATHS})
-    FIND_LIBRARY(BOOST_LIB_SYSTEM libboost_system-vc90-mt${EXTENSION}-1_35 ${BOOST_LIB_PATHS})
+    FOREACH(name thread date_time signals filesystem system)
+      SET(LIB_NAMES)
+      FOREACH(version 1_35 1_38)
+	SET(LIB_NAMES ${LIB_NAMES} libboost_${name}-vc90-mt${EXTENSION}-${version})
+      ENDFOREACH(version 1_35 1_38)
+      FIND_LIBRARY(BOOST_LIB_${name} NAMES ${LIB_NAMES} PATHS ${BOOST_LIB_PATHS})
+      IF(NOT BOOST_LIB_${name})
+	SET(BOOST_STATUS 0)
+      ENDIF(NOT BOOST_LIB_${name})
+      SET(BOOST_LIBS ${BOOST_LIBS} ${BOOST_LIB_${name}})
+    ENDFOREACH(name thread date_time signals filesystem system)
   ELSE(WINDOWS)
     FIND_LIBRARY(BOOST_LIB_THREAD boost_thread ${BOOST_LIB_PATHS})
+    SET(BOOST_LIBS ${BOOST_LIBS} ${BOOST_LIB_THREAD})
   ENDIF(WINDOWS)
-  SET(BOOST_LIBS)
-  SET(BOOST_LIBS ${BOOST_LIBS} ${BOOST_LIB_THREAD})
-  SET(BOOST_LIBS ${BOOST_LIBS} ${BOOST_LIB_DATE_TIME})
-  SET(BOOST_LIBS ${BOOST_LIBS} ${BOOST_LIB_SIGNALS})
-  SET(BOOST_LIBS ${BOOST_LIBS} ${BOOST_LIB_FILESYSTEM})
-  SET(BOOST_LIBS ${BOOST_LIBS} ${BOOST_LIB_SYSTEM})
 ENDIF(BOOST_STATUS)
 
 # ------