From 5d9047490f86f042c3c93f2b8ab61762b05d8346 Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 9 Oct 2009 14:32:39 +0000 Subject: [PATCH] *** empty log message *** --- salome_adm/cmake_files/FindBOOST.cmake | 36 ++++++++++++-------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/salome_adm/cmake_files/FindBOOST.cmake b/salome_adm/cmake_files/FindBOOST.cmake index 4f052d011..249cdee86 100644 --- a/salome_adm/cmake_files/FindBOOST.cmake +++ b/salome_adm/cmake_files/FindBOOST.cmake @@ -103,32 +103,28 @@ 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) - FOREACH(name thread date_time signals filesystem system) + FOREACH(name thread date_time signals filesystem system) + 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) 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) - FOREACH(name thread date_time signals filesystem system) + ELSE(WINDOWS) 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) + ENDIF(WINDOWS) + IF(NOT BOOST_LIB_${name}) + SET(BOOST_STATUS 0) + ENDIF(NOT BOOST_LIB_${name}) + STRING(TOUPPER ${name} upname) + SET(BOOST_LIB_${upname} ${BOOST_LIB_${name}}) + SET(BOOST_LIBS ${BOOST_LIBS} ${BOOST_LIB_${name}}) + ENDFOREACH(name thread date_time signals filesystem system) ENDIF(BOOST_STATUS) # ------ -- 2.39.2