[Cmake-commits] [cmake-commits] lowman committed FindBoost.cmake 1.25 1.26
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Jan 19 02:27:36 EST 2009
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv17191
Modified Files:
FindBoost.cmake
Log Message:
ENH: Added 1.38 since it'll be out soon. More documentation and clarified examples, addressed autolinking issue on MSVC
Index: FindBoost.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindBoost.cmake,v
retrieving revision 1.25
retrieving revision 1.26
diff -C 2 -d -r1.25 -r1.26
*** FindBoost.cmake 19 Jan 2009 06:02:46 -0000 1.25
--- FindBoost.cmake 19 Jan 2009 07:27:32 -0000 1.26
***************
*** 2,12 ****
# Usage of this module as follows:
#
! # SET(Boost_USE_STATIC_LIBS ON)
! # SET(Boost_USE_MULTITHREADED ON)
! # FIND_PACKAGE( Boost 1.34.1 COMPONENTS date_time filesystem iostreams ... )
#
! # INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
! # ADD_EXECUTABLE(foo foo.cc)
! # TARGET_LINK_LIBRARIES(foo ${Boost_LIBRARIES})
#
# The components list needs to be the actual names of boost libraries, that is
--- 2,20 ----
# Usage of this module as follows:
#
! # == Using Header-Only libraries from within Boost: ==
#
! # FIND_PACKAGE( Boost 1.36.0 )
! # INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
! # ADD_EXECUTABLE(foo foo.cc)
! #
! # == Using actual libraries from within Boost: ==
! #
! # SET(Boost_USE_STATIC_LIBS ON)
! # SET(Boost_USE_MULTITHREADED ON)
! # FIND_PACKAGE( Boost 1.36.0 COMPONENTS date_time filesystem system ... )
! # INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
! #
! # ADD_EXECUTABLE(foo foo.cc)
! # TARGET_LINK_LIBRARIES(foo ${Boost_LIBRARIES})
#
# The components list needs to be the actual names of boost libraries, that is
***************
*** 16,24 ****
# foreach) you do not need to specify COMPONENTS.
#
! # You can provide a minimum version number that should be used. If you provide this
# version number and specify the REQUIRED attribute, this module will fail if it
# can't find the specified or a later version. If you specify a version number this is
# automatically put into the considered list of version numbers and thus doesn't need
! # to be specified in the Boost_ADDITIONAL_VERSIONS variable
#
# =========== The mess that is Boost_ADDITIONAL_VERSIONS (sorry?) ============
--- 24,43 ----
# foreach) you do not need to specify COMPONENTS.
#
! # You should provide a minimum version number that should be used. If you provide this
# version number and specify the REQUIRED attribute, this module will fail if it
# can't find the specified or a later version. If you specify a version number this is
# automatically put into the considered list of version numbers and thus doesn't need
! # to be specified in the Boost_ADDITIONAL_VERSIONS variable (see below).
! #
! # NOTE for Visual Studio Users:
! # Automatic linking is used on MSVC & Borland compilers by default when
! # #including things in Boost. It's important to note that setting
! # Boost_USE_STATIC_LIBS to OFF is NOT enough to get you dynamic linking,
! # autolinking typically uses static libraries by default.
! #
! # Please see the section below near Boost_LIB_DIAGNOSTIC_DEFINITIONS for
! # more details. Adding a TARGET_LINK_LIBRARIES() as shown in the example
! # above appears to cause VS to link dynamically if Boost_USE_STATIC_LIBS
! # gets set to OFF.
#
# =========== The mess that is Boost_ADDITIONAL_VERSIONS (sorry?) ============
***************
*** 28,47 ****
# for Boost. Unfortunately boost puts the version number into the
# actual filename for the libraries, so this variable will certainly be needed
! # in the future when new Boost versions are released. CMake will one day have glob
! # or regex support for FIND_LIBRARY() after which this variable will
! # likely be ignored.
#
# Currently this module searches for the following version numbers:
# 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 1.35, 1.35.0, 1.35.1,
! # 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0
#
# NOTE: If you add a new major 1.x version in Boost_ADDITIONAL_VERSIONS you should
! # add both 1.x and 1.x.0 as shown above.
#
# SET(Boost_ADDITIONAL_VERSIONS "0.99" "0.99.0" "1.78" "1.78.0")
#
- # One day in the near future this will no longer be necessary and which
- # version gets selected will depend completely on how you call FIND_PACKAGE().
- #
# ============================================================================
#
--- 47,63 ----
# for Boost. Unfortunately boost puts the version number into the
# actual filename for the libraries, so this variable will certainly be needed
! # in the future when new Boost versions are released.
#
# Currently this module searches for the following version numbers:
# 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 1.35, 1.35.0, 1.35.1,
! # 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0
#
# NOTE: If you add a new major 1.x version in Boost_ADDITIONAL_VERSIONS you should
! # add both 1.x and 1.x.0 as shown above. Official boost include directories
! # omit the 3rd version number from include paths if it is 0 although not all
! # binary boost releases do so.
#
# SET(Boost_ADDITIONAL_VERSIONS "0.99" "0.99.0" "1.78" "1.78.0")
#
# ============================================================================
#
***************
*** 61,69 ****
# the boost include directory. Please see
# the documentation above regarding this
! # annoying variable :(
#
# Boost_DEBUG Set this to TRUE to enable debugging output
# of FindBoost.cmake if you are having problems.
! # Please enable this and include the output in any bug reports.
#
# Boost_COMPILER Set this to the compiler suffix used by boost (e.g. -gcc43) if the
--- 77,86 ----
# the boost include directory. Please see
# the documentation above regarding this
! # annoying, but necessary variable :(
#
# Boost_DEBUG Set this to TRUE to enable debugging output
# of FindBoost.cmake if you are having problems.
! # Please enable this before filing any bug
! # reports.
#
# Boost_COMPILER Set this to the compiler suffix used by boost (e.g. -gcc43) if the
***************
*** 110,114 ****
# Boost's automatic linking outputted
# during compilation time.
!
# For each component you list the following variables are set.
# ATTENTION: The component names need to be in lower case, just as the boost
--- 127,131 ----
# Boost's automatic linking outputted
# during compilation time.
! #
# For each component you list the following variables are set.
# ATTENTION: The component names need to be in lower case, just as the boost
***************
*** 147,151 ****
# versions, find those that are acceptable to the user request.
set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
! "1.37.0" "1.37"
"1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0"
"1.34" "1.33.1" "1.33.0" "1.33")
--- 164,168 ----
# versions, find those that are acceptable to the user request.
set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
! "1.38.0" "1.38" "1.37.0" "1.37"
"1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0"
"1.34" "1.33.1" "1.33.0" "1.33")
More information about the Cmake-commits
mailing list