Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Small fix for check_openmpi.m4
[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 65600aa3944f245719bf766fbdd4c3c9e1278e08..c8998192214cb96f405ae87903be5eaadf9d963b 100644
(file)
--- a/
salome_adm/cmake_files/FindBOOST.cmake
+++ b/
salome_adm/cmake_files/FindBOOST.cmake
@@
-1,4
+1,4
@@
-# Copyright (C) 2007-20
08
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-20
10
CEA/DEN, EDF R&D, OPEN CASCADE
#
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
#
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-19,6
+19,7
@@
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
+
# ------
MESSAGE(STATUS "Check for boost ...")
# ------
MESSAGE(STATUS "Check for boost ...")
@@
-53,6
+54,9
@@
IF(BOOST_STATUS)
SET(BOOST_ROOT_USER ${WITH_BOOST})
ELSE(WITH_BOOST)
SET(BOOST_ROOT_USER $ENV{BOOST_ROOT})
SET(BOOST_ROOT_USER ${WITH_BOOST})
ELSE(WITH_BOOST)
SET(BOOST_ROOT_USER $ENV{BOOST_ROOT})
+ IF(NOT BOOST_ROOT_USER)
+ SET(BOOST_ROOT_USER $ENV{BOOSTDIR})
+ ENDIF(NOT BOOST_ROOT_USER)
ENDIF(WITH_BOOST)
ENDIF(BOOST_STATUS)
ENDIF(WITH_BOOST)
ENDIF(BOOST_STATUS)
@@
-111,9
+115,9
@@
IF(BOOST_STATUS)
SET(EXTENSION)
ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
SET(LIB_NAMES)
SET(EXTENSION)
ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
SET(LIB_NAMES)
- FOREACH(version 1_35 1_38)
+ FOREACH(version 1_35 1_38
1_42
)
SET(LIB_NAMES ${LIB_NAMES} libboost_${name}-vc90-mt${EXTENSION}-${version})
SET(LIB_NAMES ${LIB_NAMES} libboost_${name}-vc90-mt${EXTENSION}-${version})
- ENDFOREACH(version 1_35 1_38)
+ ENDFOREACH(version 1_35 1_38
1_42
)
FIND_LIBRARY(BOOST_LIB_${name} NAMES ${LIB_NAMES} PATHS ${BOOST_LIB_PATHS} ${BOOST_FIND_PATHS_OPTION})
ELSE(WINDOWS)
FIND_LIBRARY(BOOST_LIB_${name} boost_${name} PATHS ${BOOST_LIB_PATHS} ${BOOST_FIND_PATHS_OPTION})
FIND_LIBRARY(BOOST_LIB_${name} NAMES ${LIB_NAMES} PATHS ${BOOST_LIB_PATHS} ${BOOST_FIND_PATHS_OPTION})
ELSE(WINDOWS)
FIND_LIBRARY(BOOST_LIB_${name} boost_${name} PATHS ${BOOST_LIB_PATHS} ${BOOST_FIND_PATHS_OPTION})