Commit Graph

208 Commits

Author SHA1 Message Date
Brad King
a027128400 Merge topic 'FindBoost-link-threads'
bd831ed094 FindBoost: Add system thread library to Boost_LIBRARIES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2570
2018-11-09 11:38:07 -05:00
Felix Geyer
bd831ed094 FindBoost: Add system thread library to Boost_LIBRARIES
Add the system thread library to Boost_LIBRARIES when the boost thread
component has been found.

The Boost::thread imported target already pulls in Threads::Threads.
This changes does the same for projects using the Boost_LIBRARIES variable
instead.
2018-11-09 10:38:45 -05:00
Brad King
3f22656d8c Merge branch 'backport-FindBoost-explicit-arch-tag' 2018-11-05 11:45:58 -05:00
Brad King
1e08b625c2 FindBoost: Add explicit Boost_ARCHITECTURE option
Boost 1.66 and above built with `--layout=versioned` add an architecture
tag to the library file names.  We already try to compute this tag
automatically when `CMAKE_CXX_COMPILER_ARCHITECTURE_ID` is available,
but that is currently not computed everywhere.  Add an explicit
`Boost_ARCHITECTURE` option that a user can set to specify the
architecture tag.

Issue: #17701
2018-11-05 10:55:15 -05:00
Brad King
08da4f8d70 Merge topic 'FindBoost-exact-version'
9855a80fd4 FindBoost: search default path if Boost_FIND_VERSION_EXACT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2543
2018-11-02 07:53:22 -04:00
Brad King
caaa51b9a1 Merge topic 'FindBoost-debug-lib-prefix'
c664470966 FindBoost: Output Boost_LIB_PREFIX if Boost_DEBUG=ON requested

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Roger Leigh <rleigh@codelibre.net>
Merge-request: !2548
2018-10-31 09:33:08 -04:00
Brad King
a298c18812 Merge topic 'FindBoost-stacktrace'
b27cf72dea FindBoost: Add support for stacktrace components

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Roger Leigh <rleigh@codelibre.net>
Merge-request: !2541
2018-10-30 11:00:00 -04:00
Mateusz Łoskot
c664470966
FindBoost: Output Boost_LIB_PREFIX if Boost_DEBUG=ON requested
Output Boost_NAMESPACE too.
2018-10-30 11:07:48 +01:00
Brad King
67b19119da Merge branch 'FindBoost-stacktrace' into release-3.13
Merge-request: !2541
2018-10-29 16:11:02 -04:00
Martin Quinson
b27cf72dea FindBoost: Add support for stacktrace components
Define the headers associated to `boost_stacktrace_*`.

Fixes: #17297
2018-10-29 16:09:56 -04:00
Hannes Franke
9855a80fd4 FindBoost: search default path if Boost_FIND_VERSION_EXACT
Search paths for boost versions should be build using _boost_TEST_VERSIONS
instead of _Boost_KNOWN_VERSIONS because if Boost_FIND_VERSION_EXACT
is used _Boost_KNOWN_VERSIONS is empty and boost isn't found even in its
default installation path.

Fixes: #17986
2018-10-29 16:44:40 +01:00
Brad King
2459b5e832 Merge topic 'FindBoost-1.69'
364fb69adc FindBoost: Add support for upcoming Boost 1.69

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Mateusz Łoskot <mateusz@loskot.net>
Merge-request: !2522
2018-10-25 07:42:35 -04:00
Brad King
ef91680a05 Merge branch 'FindBoost-1.69' into release-3.13
Merge-request: !2522
2018-10-25 07:41:36 -04:00
Mateusz Łoskot
364fb69adc FindBoost: Add support for upcoming Boost 1.69
This makes the module usable with Boost from its current master.
2018-10-25 07:39:48 -04:00
Kitware Robot
df4ed1e9ff Help: Convert remaining modules to block-style comments 2018-10-22 11:09:34 -04:00
Mario Bielert
9c75922745 FindBoost: Search for -mt variant of release libs
We were searching the `-mt` variant for debug libs only.
It makes sense for release libs too.
2018-10-11 14:16:34 -04:00
Roger Leigh
ee300dc25d FindBoost: Suppress imported targets warning if Boost was not found
Fixes: #18330
2018-09-12 14:44:57 +01:00
Brad King
f13d4b1077 Merge topic 'replace-os-x-name-with-macos'
ab2e35d614 Replace occurrences of "Mac OS X" with "macOS" in comments
fc1602456a Help: Replace occurrences of "Mac OS X" with "macOS"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Gregor Jasny <gjasny@googlemail.com>
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Merge-request: !2351
2018-09-11 08:28:05 -04:00
Bartosz Kosiorek
ab2e35d614 Replace occurrences of "Mac OS X" with "macOS" in comments
Apple's main Operating system changed their name from OS X to macOS:

    https://www.engadget.com/2016/06/13/os-x-is-now-macos/

Revise source comments accordingly.
2018-09-10 13:34:09 +02:00
Brad King
cb800ebb83 Merge topic 'FindBoost-old-context'
9a800c12fc FindBoost: Fix context discovery for 1.60 and below

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2348
2018-09-05 14:32:27 -04:00
Igor Kostenko
9a800c12fc FindBoost: Fix context discovery for 1.60 and below
* `all.hpp` was removed in 1.68:
  2e37599461
* `fcontext.hpp` was moved to detail in 1.61:
  c2f0dfdf26

Fixes: #18126
2018-09-04 12:41:36 -04:00
Brad King
718d2f8f16 Merge topic 'boost-1.68-beta1'
b76b93c728 FindBoost: Change context header used
c8a7835ea9 FindBoost: Add support for Boost 1.68 beta1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alexander Grund <github@grundis.de>
Merge-request: !2204
2018-07-13 08:54:16 -04:00
Roger Leigh
b76b93c728 FindBoost: Change context header used
boost/context/all.hpp is removed in Boost 1.68.
boost/context/detail/fcontext.hpp is present in all Boost
releases containing context (≥1.61).
2018-07-11 23:14:21 +01:00
Roger Leigh
c8a7835ea9 FindBoost: Add support for Boost 1.68 beta1
This includes a new component, `Boost::contract`.

Fixes: #18167
2018-07-11 07:26:51 -04:00
Matt Powley
df2875b58d FindBoost: Update MSVC architecture check code style 2018-06-27 14:55:49 -04:00
Brad King
c747d4ccb3 Merge topic 'FindBoost-backport-python-deps'
81cc993f89 FindBoost: Backport versioned python dependencies for v1.35 to v1.66
557e68e1a3 FindBoost: Remove extra indentation in 1.65/1.66 dependency block

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2045
2018-05-11 09:17:02 -04:00
Filip Matzner
81cc993f89 FindBoost: Backport versioned python dependencies for v1.35 to v1.66
Update `mpi_python##` and `numpy##` component dependencies to honor
python version suffixes on components named by the caller.  Although
upstream Boost did not add version suffixes prior to version 1.67, it is
commonly done by distros.  Honor suffixes specified by project code.
Projects must take responsibility for naming distro-specific component
suffixes for versions prior to 1.67.

Fixes: #17892, #17970
2018-05-09 07:57:36 -04:00
Brad King
557e68e1a3 FindBoost: Remove extra indentation in 1.65/1.66 dependency block 2018-05-08 08:51:57 -04:00
Arkady Shapkin
45bf6f6246 Modules: Use MSVC_TOOLSET_VERSION variable to simplify logic 2018-04-04 13:21:16 -04:00
Roger Leigh
1673923c30 FindBoost: Add support for Boost 1.67 with Python version suffixes
Fixes: #16612, #16335, #16391, #12955
2018-03-21 13:34:17 -04:00
Sergiu Deitsch
2557cad5ec FindBoost: support OPTIONAL_COMPONENTS 2018-01-19 17:00:44 +01:00
Paul "TBBle" Hampson
6297d6c7fd FindBoost: Generate imported targets for future Boost versions
Per discussion on cmake/cmake#17575, this protection not particularly
valuable, as the dependency information which the imported targets wrap
is generated anyway.

This removes a road-block for using `Boost_ADDITIONAL_VERSIONS` to
support newly-released Boost versions pending a new CMake release.
2018-01-10 17:17:32 +11:00
Paul "TBBle" Hampson
d56deff7d1 FindBoost: Search for upstream-packaged libs next to includes
Upstream packages Boost binaries for Windows with the 'boost' directory
(the INCLUDE_DIR) next to the lib-... directory (the LIBRARY_DIR).
2018-01-10 17:17:27 +11:00
Paul "TBBle" Hampson
b044f69a41 FindBoost: Implement "Architecture and Address Model" tag
This tag is new in Boost 1.66.0, and is present in the 'versioned'
library file name layout.
2018-01-10 17:17:20 +11:00
Paul "TBBle" Hampson
b1e9f67137 FindBoost: Fix incorrect alphabetisation of headers list 2018-01-10 17:17:10 +11:00
Paul "TBBle" Hampson
433a2d495a FindBoost: Boost 1.66.0 dependency and release update
Release notes: http://www.boost.org/users/history/version_1_66_0.html

* All new libraries are header-only.
* _Boost_COMPONENT_DEPENDENCIES is unchanged from 1.65.1
* _Boost_FIBER_COMPILER_FEATURES is unchanged from 1.64.0
2018-01-10 17:16:57 +11:00
Craig Scott
3c413e2a31 GENERATOR_IS_MULTI_CONFIG: Use for multi-config checks in Modules 2017-12-30 09:35:56 +11:00
Roger Leigh
458c589fe3 FindBoost: Add Windows ABI tag for Clang debug
Thanks to Walter Pearce for this suggestion.

Fixes: #17505
2017-11-27 13:49:01 -05:00
Roger Leigh
00e39a4afc FindBoost: Use CMAKE_CXX_COMPILER_ID for Intel compiler 2017-11-27 13:48:22 -05:00
Ben Boeckel
d70bdc72ce FindBoost: support more than one number in version components 2017-11-06 13:26:23 -05:00
Ben Boeckel
335816efad FindBoost: use CMake's compiler version rather than querying again 2017-11-03 11:43:22 -04:00
Brad King
c044b9ae84 FindBoost: Improve messages when a Boost CMake package is found
Add a test for this case to verify the messages.  This test will also be
valuable to cover this code path in which we've had several regressions
recently.
2017-09-29 10:10:01 -04:00
Alex Turbov
a929dd166e FindBoost: Simplify search in lists
Instead of `list(FIND...)` and then checking result for `-1`
(found/not-found), nowadays `if` command has the `IN_LIST` test for
that.

This change was originally made by commit v3.9.0-rc1~41^2 (FindBoost:
Simplify search in lists, 2017-04-23) but then had to be reverted by
commit v3.9.2~3^2 (FindBoost: Revert "Simplify search in lists.",
2017-09-05) due to problems related to using `find_dependency`.  Those
problems were addressed by commit 3080a0a611 (FindBoost: Improve
behavior when thread dependency is missing, 2017-09-15), so now we can
restore the original change.

Issue: #17252
2017-09-18 13:44:25 -04:00
Brad King
3080a0a611 FindBoost: Improve behavior when thread dependency is missing
The `find_dependency` macro is not meant for use in find modules and
`return()`s from the caller when the package is not found.  Avoid using
it in FindBoost.  Instead use plain `find_package` for the Threads
package and manually forward the `QUIET` argument.  When the Threads
package is missing then treat the Boost `thread` component as missing.

Issue: #17257
2017-09-15 10:42:14 -04:00
Brad King
2581ab4395 Merge topic 'boost-1.65.1'
dbba53a5 FindBoost: Add version 1.65.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1241
2017-09-08 09:46:32 -04:00
Brad King
10a3835cbd Merge topic 'FindBoost-limit-configs'
e6159e18 FindBoost: Add option to prevent finding DEBUG/RELEASE Boost-libs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1216
2017-09-07 11:23:00 -04:00
Roger Leigh
dbba53a5aa FindBoost: Add version 1.65.1 2017-09-06 21:11:47 +01:00
Deniz Bahadir
e6159e1842 FindBoost: Add option to prevent finding DEBUG/RELEASE Boost-libs
With the use of options `Boost_USE_DEBUG_LIBS` and
`Boost_USE_RELEASE_LIBS` it is now possible to skip searching for either
DEBUG or RELEASE Boost libraries.
This is useful if Boost is installed on the system in multiple
directories but only one of them should be used which only contains e.g.
the RELEASE libraries. Without this change the DEBUG libraries might be
found in the other directory which might not be desired at all.
2017-09-06 17:58:45 +02:00
Brad King
ff0847b2d5 Merge topic 'FindBoost-fix-policy-scope'
ade45fa3 FindBoost: Revert "Simplify search in lists."

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1238
2017-09-06 10:47:49 -04:00
Brad King
ade45fa342 FindBoost: Revert "Simplify search in lists."
Revert commit v3.9.0-rc1~41^2 (FindBoost: Simplify search in lists,
2017-04-23).  It regressed the module by exposing issue #17257, but the
fix for that issue is not suitable for inclusion in a patch release.
It is simplest to revert the commit until the larger problem can be
addressed.

Fixes: #17252
2017-09-05 14:04:51 -04:00