Commit Graph

131 Commits

Author SHA1 Message Date
Brad King 531612d370 FindBoost: Remove extra indentation level
A large portion of the file was still indented for historical reasons.
2012-09-25 17:11:20 -04:00
Rolf Eike Beer 4be6783711 read less from version headers into variables
Instead of reading the whole file using file(READ) and later matching on the
whole file use file(STRINGS ... REGEX) to get only those lines we are
interested in at all. This will make the list much smaller (good for debugging)
and also the regular expressions will need to match on much smaller strings.

Also unset the content variables once they are not used anymore.
2012-08-19 13:54:56 +02:00
Kitware Robot 9db3116226 Remove CMake-language block-end command arguments
Ancient versions of CMake required else(), endif(), and similar block
termination commands to have arguments matching the command starting the
block.  This is no longer the preferred style.

Run the following shell code:

for c in else endif endforeach endfunction endmacro endwhile; do
    echo 's/\b'"$c"'\(\s*\)(.\+)/'"$c"'\1()/'
done >convert.sed &&
git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' |
egrep -z -v '^(Utilities/cm|Source/kwsys/)' |
egrep -z -v 'Tests/CMakeTests/While-Endwhile-' |
xargs -0 sed -i -f convert.sed &&
rm convert.sed
2012-08-13 14:19:16 -04:00
Kitware Robot 77543bde41 Convert CMake-language commands to lower case
Ancient CMake versions required upper-case commands.  Later command
names became case-insensitive.  Now the preferred style is lower-case.

Run the following shell code:

cmake --help-command-list |
grep -v "cmake version" |
while read c; do
    echo 's/\b'"$(echo $c | tr '[:lower:]' '[:upper:]')"'\(\s*\)(/'"$c"'\1(/g'
done >convert.sed &&
git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' |
egrep -z -v '^(Utilities/cm|Source/kwsys/)' |
xargs -0 sed -i -f convert.sed &&
rm convert.sed
2012-08-13 14:19:16 -04:00
Philip Lowman ca90709fd6 FindBoost: Future proof to 1.56 2012-06-30 03:40:37 -04:00
Philip Lowman accd0428f4 FindBoost: Fix bug where Boost_FOUND could be false when version specified
Fixes a problem where when specifying a version number without the REQUIRED
parameter, Boost_FOUND would be true on the first configure but false on
subsequent configures.
2012-06-30 03:33:56 -04:00
Rolf Eike Beer 63d4960aef FindBoost: add support for 1.49 and 1.50
Boost 1.49 has already be released. Add this and the next to come version
number to the search list.
2012-04-07 10:21:02 +02:00
David Cole cdf522436f FindBoost: Quote possibly empty string argument (#12273)
Author: Claudio Bley
2011-12-19 10:55:41 -05:00
Mateusz Loskot 1c4ba48e44 FindBoost: Use MSVC11 to find Boost on Windows (#12568)
While at it, add recent Boost versions.
2011-11-10 08:03:17 -05:00
Todd Gamblin 7da796d1fd FindBoost: Call find_package with NO_MODULE first
FindBoost now attempts to find Boost using find_package(Boost NO_MODULE)
before it does a module mode search.

User can now set any of these to Boost's install prefix to detect it in module
or config mode:

- Boost_DIR  for consistency with other CMake modules
- BOOST_ROOT or BOOSTROOT for adherence to boost convention
2011-09-01 15:00:21 -04:00
Philip Lowman 974374a9cd FindBoost: Also search for 1.46.1 2011-06-09 23:23:41 -04:00
Philip Lowman f26d1cf154 FindBoost: Fixes #12188
Workaround an issue where users wanted to use Boost_LIBRARIES with the
install() command and debug/optimized keywords were interfering.  Now
debug/optimized keywords are removed if the release & debug library
are the same.
2011-06-09 23:20:18 -04:00
Philip Lowman 5103fe58ee Lowercase all function names and improve consistency 2010-12-27 23:04:30 -05:00
Philip Lowman 97c8f77484 Fix spelling BOOST_LIBRARYDIR message. Add error for common misspellings. 2010-12-27 22:51:43 -05:00
Philip Lowman a80d6e9828 Add Boost 1.46 2010-12-13 01:21:46 -05:00
Philip Lowman 88babefbcc [patch] Add Boost 1.45 to search, simplify a check removing VERSION_LESS
Also some whitespace issues are cleaned up.
Patch from Adam Richardson attached to #11445
2010-12-13 00:56:42 -05:00
Philip Lowman fffe1c07d9 11363: FindBoost.cmake fails to find debug libraries in tagged layout install 2010-10-28 22:51:18 -04:00
Philip Lowman b867a3f1a8 Remove superfluous variable Boost_COMPAT_STATIC_RUNTIME.
There is no need to introduce this extra variable as FindBoost
can simply rely on if Boost_USE_STATIC_RUNTIME is defined
or not to disable the old searching behavior for static runtime
libraries on WIN32.
2010-10-11 22:48:33 -04:00
Philip Lowman b8b9a32170 FindBoost.cmake: Fix library search path glitch introduced in earlier commit 2010-09-19 23:15:07 -04:00
Philip Lowman 90c16d84be FindBoost.cmake: Implements 11160
Add Boost_REALPATH option for people packaging Boost with their app:

Boost_REALPATH               Resolves symbolic links for discovered boost libraries
                             to assist with packaging.  For example, instead of
                             Boost_SYSTEM_LIBRARY_RELEASE being resolved to
                             "/usr/lib/libboost_system.so" it would be
                             "/usr/lib/libboost_system.so.1.42.0" instead.
                             This does not affect linking and should not be
                             enabled unless the user needs this information.
2010-09-18 11:57:42 -04:00
Philip Lowman 95ff12091d FindBoost.cmake: Fixes 10436
Add an additional library filename permutation which fixes
library detection for some custom builds of Boost.
2010-09-18 11:21:23 -04:00
Philip Lowman 5cce138c91 FindBoost.cmake: Fixes 11121
Add support for finding Boost.Thread with special THREADAPI in filename
2010-09-18 11:19:29 -04:00
Philip Lowman 02390416e1 FindBoost.cmake: Fixes 11246
FindBoost can find shared libraries (.so) in rare circumstances
even when Boost_USE_STATIC_LIBS is set
2010-09-18 11:16:09 -04:00
Philip Lowman d4900c2eca FindBoost.cmake: Fix compiling against a boost source tree
This fixes issues 11192 & 11187.
2010-09-18 10:59:42 -04:00
Philip Lowman 6ed7d9937a FindBoost.cmake: Add Boost_NO_SYSTEM_PATHS option
This fixes several duplicate issues in the tracker (7725, 11019, 8412)
2010-09-18 10:56:15 -04:00
Philip Lowman 16b0eb5ac5 FindBoost.cmake: Miscellaneous changes and refactoring
* Add a warning if the user sets Boost_ROOT which is not correct
* Clarify directions to the user for viewing debugging messages
* Move the CMAKE_FIND_LIBRARY_SUFFIXES tweak outside of a for loop
2010-09-18 10:41:53 -04:00
Philip Lowman 5e6f0f0d73 FindBoost.cmake fixes for issues 11204 & 8529
* Fixed issue 11204: FindBoost.cmake had trouble discovering libraries
  when both -sgd and -gd libraries were available by adding a new option
  Boost_USE_STATIC_RUNTIME.
  Backwards compatibility of searching for first -gd and then -sgd on
  WIN32 is maintained unless the user sets Boost_COMPAT_STATIC_RUNTIME to
  false (or they have set Boost_USE_STATIC_RUNTIME).
* Fixed issue 8529: FindBoost was unable to detect boost libraries compiled against
  STLport, by reworking the way the Boost ABI tag is calculated.  There are additional
  ABI tag options available now as well.
* Boost_DEBUG now reports the full list of filenames being searched for when
  find_library is called.
2010-09-18 10:24:30 -04:00
Philip Lowman 8de0d1a8ca Fixes problem finding libraries under Boost (#9510) 2010-08-10 22:05:17 -04:00
Brad King cc31f89c17 Merge topic 'module-header-spelling'
2cde67a Modules: Fix spelling 'To distributed' -> 'To distribute'
2010-08-10 14:33:47 -04:00
Todd Gamblin 2cde67a781 Modules: Fix spelling 'To distributed' -> 'To distribute' 2010-08-09 08:48:31 -04:00
Brad King 187e96990c FindBoost: Search for Boost 1.43 and 1.44
The current release is 1.43 and the next release will be 1.44.
2010-08-03 16:32:09 -04:00
Brad King 2fec615852 FindBoost: Search for Boost 1.42 2010-07-28 10:29:40 -04:00
Philip Lowman 081b5dfd2e Fix Issue #9792, remove superfluous output when not searching for COMPONENTS, add 1.41 to the search 2010-01-05 00:55:14 -05:00
Bill Hoffman df487fc04e fix for bug# 9751, add check for MSVC10 2009-10-21 21:34:24 -04:00
Philip Lowman 89954fe9a2 Several minor FindBoost changes to address posts on mailing list
1. Add STATUS output "Could NOT find Boost" if boost is not found
which brings FindBoost closer in behavior to most CMake find modules.

2. Add an option: Boost_DETAILED_FAILURE_MSG to output
Boost_ERROR_REASON on a non-REQUIRED find if this
is desired by the developer.  This is done because the error messages
are rather long and software with optional Boost dependencies might
not like them showing up by default, especially since this wasn't done
before.

3. Add mention of Boost_ADDITIONAL_VERSIONS close to top
of file since this seems to be the most common problem brought
up on the mailing list (maybe people will notice it there)

4. Added additional check for intel compiler which probably isn't
necessary but ultimately should be cleaner if CMAKE_CXX_COMPILER_ID
sticks around.

5. Added my name to the Copyright list
2009-10-09 01:15:56 -04:00
Brad King c4bb9c9d42 Convert CMake find-modules to BSD License
This adds copyright/license notification blocks CMake's find-modules.
Many of the modules had no notices at all.  Some had notices referring
to the BSD license already.  This commit normalizes existing notices and
adds missing notices.
2009-09-28 11:45:50 -04:00
Philip Lowman 30e3dba27c Make Boost easier to find 2009-09-21 23:42:39 -04:00
Philip Lowman 448f88d46b Fix Bug #9158: FindBoost.cmake does not work properly with nmake and icl 2009-09-21 22:21:51 -04:00
Philip Lowman 9c2a38b836 Fix boost library detection with Sun Studio compiler (Issue #9153) 2009-09-20 11:33:06 -04:00
Philip Lowman 4bf4cbd8a2 Add Boost 1.39 & 1.40. Move ${Boost_INCLUDE_DIR}/lib to front of library search. 2009-08-19 22:28:46 -04:00
Bill Hoffman 1287fc1fbf ENH: boost lib is often found under the boost include dir 2009-06-23 16:40:50 -04:00
Bill Hoffman 65aa0b8765 ENH: add additional place to look for boost so it works out of the box on windows 2009-06-23 16:31:41 -04:00
Alexander Neundorf 879f2f98fe STYLE: fix typos in the docs
Alex
2009-04-19 12:47:01 -04:00
Philip Lowman 1a0512b061 BUG: LIST(REMOVE_ITEM...) was being called on a variable that could be empty. 2009-03-20 23:52:32 -04:00
Philip Lowman 10da3f74ea BUG: Eliminates detection of Boost system library prior to 1.35 (see issue #8734) 2009-03-16 22:28:35 -04:00
Philip Lowman cd3984eea3 STYLE: Moved functions/macros to top of file so main is more readable. 2009-03-12 21:06:08 -04:00
Philip Lowman feb21f1dc0 STYLE: Fix documentation bug regarding Boost_<COMPONENT>_LIBRARY (COMPONENT
should be uppercase).
2009-03-02 21:09:36 -05:00
Philip Lowman a58e183636 BUG: Fix issue #8576 FindBoost regression finding static libs, impacts MinGW and Intel/Windows compilers. 2009-02-24 00:49:01 -05:00
Philip Lowman 17656ace03 BUG: Resolves Issue #8393, Remove workarounds in FindBoost once UNC-Path bug
is fixed
2009-02-09 22:39:31 -05:00
Philip Lowman cae2da8d16 STYLE: Improved examples, spelling & grammar in documentation 2009-02-09 22:34:13 -05:00
Philip Lowman 163af93449 BUG: Fix detection of boost libraries without any compiler encoding (e.g.
Gentoo 1.37 system installed boost).  Fixes issue #8404 reported on mailing
list.
2009-01-19 22:51:27 -05:00
Philip Lowman 4dae139ad4 BUG: Missing "icpc" as a possible CXX compiler for Intel C++. Also refactored
gcc -dumpversion code and regex to a function.
2009-01-19 21:30:04 -05:00
Philip Lowman 9aaa9f7529 BUG: Switch FindBoost.cmake to use CMAKE_COMPILER_IS_GNUCXX (Issue #8398) 2009-01-19 19:21:10 -05:00
Philip Lowman d69e68609c BUG: Reverted change made in 1.27, should be unnecessary (Issue #7508) 2009-01-19 05:14:30 -05:00
Philip Lowman b87e0687bd BUG: Resolve Issue #7508, FindBoost fails to find boost on SuSE 10.3 2009-01-19 02:35:03 -05:00
Philip Lowman ab36f5a11e ENH: Added 1.38 since it'll be out soon. More documentation and clarified examples, addressed autolinking issue on MSVC 2009-01-19 02:27:32 -05:00
Philip Lowman 6d37f93a38 BUG: Do not check for GCC version encoding in filenames on Boost libraries prior to 1.35. Eliminate "lib" prefix except on MSVC. 2009-01-19 01:02:46 -05:00
Philip Lowman f7ba5a7fc8 BUG: Fixed additional issues with autodetecting compiler tags properly including Issue #6926 2009-01-18 17:19:54 -05:00
Philip Lowman ee91442a90 BUG: Fixes problem with _boost_ABI_TAG appending to itself if FindBoost is called more than once (Issue #7460) 2009-01-18 16:40:53 -05:00
Philip Lowman d077940f94 STYLE: minor cleanup 2009-01-18 15:53:45 -05:00
Philip Lowman c4e85549c9 BUG: Removed some code which was squashing Boost_LIBRARIES on WIN32 under the auspices of forcing the user to use autolinking, but it only did this squashing on the first call to FindBoost. Subsequent calls to FindBoost would not have Boost_LIBRARIES squashed so this code was doing nothing. If you link your target_link_libraries() against dynamic boost libraries it appears from tools like Dependency Walker that the pragma calls to autolink to the static boost libraries are ignored. It's therefore too late to make this squash apply to all calls to FindBoost because that would break users that have not setup autolinking properly. For now this fix is largely cosmetic since the original code never worked anyways (see version 1.5 introduced on 4/22/08). 2009-01-18 15:41:18 -05:00
Philip Lowman 909dd8af48 BUG: Fixed documentation bug with Boost_USE_MULTITHREADED, removed OPTION() call since it would be useless and confusing after an initial configure. 2009-01-18 15:17:31 -05:00
Philip Lowman 5913dc1e88 BUG: Fixed superfluous and duplicate dirs in Boost_LIBRARY_DIR. Employed workaround for Issue #8378. Resolves Issue #8099 2009-01-18 14:40:48 -05:00
Philip Lowman 34b9dcc3b2 BUG: Fixed issues using FindBoost with BoostPro packaged releases. Fixed
regression for bjam users on Win32 introduced in 1.4.2.4 (7/13/08).  This
commit partially or completely resolves Issues #8173, #8326, #7943, #7725!
2009-01-16 04:07:03 -05:00
Philip Lowman 20f2a086d3 BUG: fixed bug #7529: FindBoost fails to find boost on SuSE 11.0 due to GCC
reporting version x.y and not x.y.z
2009-01-15 02:07:03 -05:00
Philip Lowman 0864c71c3b BUG: Fixes bug #8059. Also added Boost_DEBUG variable for troubleshooting. 2009-01-15 01:22:15 -05:00
Brad King db4f2bdffc BUG: Avoid boost versions less than required
Construction of a list of candidate versions used to produce search
paths now discards versions less than requested by the user.
See issue #7783.
2008-10-09 17:04:11 -04:00
Brad King 79a3807340 BUG: Fix FindBoost versioned find
To locate the boost include directory, all search paths and versioned
path suffixes should be passed to one call of FIND_PATH.  Previously the
test for one version would find an unversioned system boost even when
the user set BOOST_ROOT (since the NO_DEFAULT_PATH option is not used).
See issue #7456.
2008-09-16 10:30:32 -04:00
Douglas Gregor f0dac4d017 BUG: Be more careful with Boost_MINOR_VERSION in FindBoost module 2008-07-28 15:40:04 -04:00
Douglas Gregor c2a782a621 BUG: Work around Boost 1.36.0 bug fix on Darwin by setting the mangled compiler name to -xgccVERSION 2008-07-28 14:33:40 -04:00
Douglas Gregor 89a39b48c3 ENH: FindBoost can now find the upcoming Boost 1.46 2008-07-14 13:52:53 -04:00
Douglas Gregor 247b7cc551 COMP: Find Boost as installed by the BoostPro/Boost Consulting installers on Windows 2008-07-03 18:19:39 -04:00
Douglas Gregor 566647d34f ENH: Cleanup FindBoost module, fixing several small bugs and providing better diagnostic information when things go wrong 2008-07-03 15:49:41 -04:00
Douglas Gregor a1f1b712c5 BUG: Fix FindBoost version variable names to correct bug in Boost version detection 2008-05-09 21:26:57 -04:00
Alexander Neundorf 4f961bce0a BUG: don't use CMAKE_MINIMUM_REQUIRED() in find modules, it can change the
policy settings done in the projects cmake files (and it doesn't make sense
since it is always part of the correct cmake version)

Alex
2008-04-26 13:25:07 -04:00
Douglas Gregor 629620f9d4 ENH: FindBoost always sets Boost_LIBRARY_DIRS when it finds the Boost libraries 2008-04-22 13:32:07 -04:00
Douglas Gregor d278ba74b5 ENH: Integrated FindBoost improvements changes from Andreas Pakulat, Mike Jackson, and myself 2008-04-22 13:14:51 -04:00
Alexander Neundorf 3d6f10650e BUG: it seems on some installations boost is installed under boost-1_34 ,
see #5030

FindBoost.cmake recommends using LINK_DIRECTORIES(), is this really good ?

Alex
2008-01-10 18:52:19 -05:00
Bill Hoffman 4b2925222a BUG: fix for bug 5464 better find boost for windows 2007-12-18 10:02:52 -05:00
Alexander Neundorf 13db5b578b ENH: add second failure message parameter to
FIND_PACKAGE_HANDLE_STANDARD_ARGS(), so cmake modules can specify their own
better failure messages. If the default is ok use "DEFAULT_MSG".
Do this also for FindBoost.cmake (#5349)

Alex
2007-07-23 09:49:52 -04:00
Brad King ef6cf109ed ENH: Adding FindBoost.cmake module from Andrew Maclean. This addresses bug#3447. 2006-07-21 12:04:05 -04:00