*** empty log message ***

[modules/kernel.git] / salome_adm / cmake_files / FindBOOST.cmake

diff --git a/salome_adm/cmake_files/FindBOOST.cmake b/salome_adm/cmake_files/FindBOOST.cmake
index da046935408a209258f5cf969d10bcebf091b1ec..4f052d011a086b5459f1d78039c8392cfa7d5251 100644 (file)
--- a/salome_adm/cmake_files/FindBOOST.cmake
+++ b/salome_adm/cmake_files/FindBOOST.cmake
@@ -102,21 +102,33 @@ IF(BOOST_STATUS)
 ENDIF(BOOST_STATUS)
 
 IF(BOOST_STATUS)
+  SET(BOOST_LIBS)
   IF(WINDOWS)
-    FIND_LIBRARY(BOOST_LIB_THREAD libboost_thread-vc90-mt-gd-1_35 ${BOOST_LIB_PATHS})
-    FIND_LIBRARY(BOOST_LIB_DATE_TIME libboost_date_time-vc90-mt-gd-1_35 ${BOOST_LIB_PATHS})
-    FIND_LIBRARY(BOOST_LIB_SIGNALS libboost_signals-vc90-mt-gd-1_35 ${BOOST_LIB_PATHS})
-    FIND_LIBRARY(BOOST_LIB_FILESYSTEM libboost_filesystem-vc90-mt-gd-1_35 ${BOOST_LIB_PATHS})
-    FIND_LIBRARY(BOOST_LIB_SYSTEM libboost_system-vc90-mt-gd-1_35 ${BOOST_LIB_PATHS})
+    IF(CMAKE_BUILD_TYPE STREQUAL Debug)
+      SET(EXTENSION -gd)
+    ELSE(CMAKE_BUILD_TYPE STREQUAL Debug)
+      SET(EXTENSION)
+    ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
+    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})
+    FOREACH(name thread date_time signals filesystem system)
+      FIND_LIBRARY(BOOST_LIB_${name} boost_${name} 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)
   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)
 
 # ------