diff options
| author | Kevin Meagher <11620178+kjmeagher@users.noreply.github.com> | 2020-10-28 11:19:50 -0500 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-08-04 19:29:05 +0200 |
| commit | 7ce29e1eda0425205770b9952aa476126d73e7d2 (patch) | |
| tree | f2bf1a6ad18cb7de3962ef788dcd7a776ce5d854 /test cases/frameworks | |
| parent | 9da99e7a59cafdb9746ccd0cc148e454f0fa8b44 (diff) | |
| download | meson-7ce29e1eda0425205770b9952aa476126d73e7d2.zip meson-7ce29e1eda0425205770b9952aa476126d73e7d2.tar.gz meson-7ce29e1eda0425205770b9952aa476126d73e7d2.tar.bz2 | |
Relax restrictions on detecting boost dependency
This does two things:
* allows the library files to be symlinks
* searches `lib` and `lib64` in `BOOST_ROOT` even if it finds lib
directories from the compiler
The first condition is needed for the homebrew on macOS because boost and boost
python are provided in seperate packages and are put together in /usr/local/lib
with symlinks to the library files. The both conditions are needed for high
performace computing environments where dependencies are often provided in
nonstandard directories with symlinks
A test case was added which looks for boost libraries in seperate directories
which have been symlinked to BOOST_ROOT/lib
Diffstat (limited to 'test cases/frameworks')
16 files changed, 18 insertions, 0 deletions
diff --git a/test cases/frameworks/35 boost symlinks/boost/Cellar/boost-python/0.3.0/lib/boost_python-vc142-mt-gd-x32-0_3.lib b/test cases/frameworks/35 boost symlinks/boost/Cellar/boost-python/0.3.0/lib/boost_python-vc142-mt-gd-x32-0_3.lib new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test cases/frameworks/35 boost symlinks/boost/Cellar/boost-python/0.3.0/lib/boost_python-vc142-mt-gd-x32-0_3.lib diff --git a/test cases/frameworks/35 boost symlinks/boost/Cellar/boost-python/0.3.0/lib/boost_python-vc142-mt-gd-x64-0_3.lib b/test cases/frameworks/35 boost symlinks/boost/Cellar/boost-python/0.3.0/lib/boost_python-vc142-mt-gd-x64-0_3.lib new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test cases/frameworks/35 boost symlinks/boost/Cellar/boost-python/0.3.0/lib/boost_python-vc142-mt-gd-x64-0_3.lib diff --git a/test cases/frameworks/35 boost symlinks/boost/Cellar/boost-python/0.3.0/lib/libboost_python.so.0.3.0 b/test cases/frameworks/35 boost symlinks/boost/Cellar/boost-python/0.3.0/lib/libboost_python.so.0.3.0 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test cases/frameworks/35 boost symlinks/boost/Cellar/boost-python/0.3.0/lib/libboost_python.so.0.3.0 diff --git a/test cases/frameworks/35 boost symlinks/boost/Cellar/boost/0.3.0/include/boost/version.hpp b/test cases/frameworks/35 boost symlinks/boost/Cellar/boost/0.3.0/include/boost/version.hpp new file mode 100644 index 0000000..77d9948 --- /dev/null +++ b/test cases/frameworks/35 boost symlinks/boost/Cellar/boost/0.3.0/include/boost/version.hpp @@ -0,0 +1,3 @@ +#define BOOST_VERSION 300 + +#error This is not a real version of boost diff --git a/test cases/frameworks/35 boost symlinks/boost/Cellar/boost/0.3.0/lib/boost_regex-vc142-mt-gd-x32-0_3.lib b/test cases/frameworks/35 boost symlinks/boost/Cellar/boost/0.3.0/lib/boost_regex-vc142-mt-gd-x32-0_3.lib new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test cases/frameworks/35 boost symlinks/boost/Cellar/boost/0.3.0/lib/boost_regex-vc142-mt-gd-x32-0_3.lib diff --git a/test cases/frameworks/35 boost symlinks/boost/Cellar/boost/0.3.0/lib/boost_regex-vc142-mt-gd-x64-0_3.lib b/test cases/frameworks/35 boost symlinks/boost/Cellar/boost/0.3.0/lib/boost_regex-vc142-mt-gd-x64-0_3.lib new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test cases/frameworks/35 boost symlinks/boost/Cellar/boost/0.3.0/lib/boost_regex-vc142-mt-gd-x64-0_3.lib diff --git a/test cases/frameworks/35 boost symlinks/boost/Cellar/boost/0.3.0/lib/libboost_regex.so.0.3.0 b/test cases/frameworks/35 boost symlinks/boost/Cellar/boost/0.3.0/lib/libboost_regex.so.0.3.0 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test cases/frameworks/35 boost symlinks/boost/Cellar/boost/0.3.0/lib/libboost_regex.so.0.3.0 diff --git a/test cases/frameworks/35 boost symlinks/boost/include/boost b/test cases/frameworks/35 boost symlinks/boost/include/boost new file mode 120000 index 0000000..8acd7e2 --- /dev/null +++ b/test cases/frameworks/35 boost symlinks/boost/include/boost @@ -0,0 +1 @@ +../Cellar/boost/0.3.0/include/boost
\ No newline at end of file diff --git a/test cases/frameworks/35 boost symlinks/boost/lib/boost_python-vc142-mt-gd-x32-0_3.lib b/test cases/frameworks/35 boost symlinks/boost/lib/boost_python-vc142-mt-gd-x32-0_3.lib new file mode 120000 index 0000000..7ba5b3d --- /dev/null +++ b/test cases/frameworks/35 boost symlinks/boost/lib/boost_python-vc142-mt-gd-x32-0_3.lib @@ -0,0 +1 @@ +../Cellar/boost-python/0.3.0/lib/boost_python-vc142-mt-gd-x32-0_3.lib
\ No newline at end of file diff --git a/test cases/frameworks/35 boost symlinks/boost/lib/boost_python-vc142-mt-gd-x64-0_3.lib b/test cases/frameworks/35 boost symlinks/boost/lib/boost_python-vc142-mt-gd-x64-0_3.lib new file mode 120000 index 0000000..f4585ab --- /dev/null +++ b/test cases/frameworks/35 boost symlinks/boost/lib/boost_python-vc142-mt-gd-x64-0_3.lib @@ -0,0 +1 @@ +../Cellar/boost-python/0.3.0/lib/boost_python-vc142-mt-gd-x64-0_3.lib
\ No newline at end of file diff --git a/test cases/frameworks/35 boost symlinks/boost/lib/boost_regex-vc142-mt-gd-x32-0_3.lib b/test cases/frameworks/35 boost symlinks/boost/lib/boost_regex-vc142-mt-gd-x32-0_3.lib new file mode 120000 index 0000000..eb7204d --- /dev/null +++ b/test cases/frameworks/35 boost symlinks/boost/lib/boost_regex-vc142-mt-gd-x32-0_3.lib @@ -0,0 +1 @@ +../Cellar/boost/0.3.0/lib/boost_regex-vc142-mt-gd-x32-0_3.lib
\ No newline at end of file diff --git a/test cases/frameworks/35 boost symlinks/boost/lib/boost_regex-vc142-mt-gd-x64-0_3.lib b/test cases/frameworks/35 boost symlinks/boost/lib/boost_regex-vc142-mt-gd-x64-0_3.lib new file mode 120000 index 0000000..fb4fc14 --- /dev/null +++ b/test cases/frameworks/35 boost symlinks/boost/lib/boost_regex-vc142-mt-gd-x64-0_3.lib @@ -0,0 +1 @@ +../Cellar/boost/0.3.0/lib/boost_regex-vc142-mt-gd-x64-0_3.lib
\ No newline at end of file diff --git a/test cases/frameworks/35 boost symlinks/boost/lib/libboost_python.so.0.3.0 b/test cases/frameworks/35 boost symlinks/boost/lib/libboost_python.so.0.3.0 new file mode 120000 index 0000000..f75f655 --- /dev/null +++ b/test cases/frameworks/35 boost symlinks/boost/lib/libboost_python.so.0.3.0 @@ -0,0 +1 @@ +../Cellar/boost-python/0.3.0/lib/libboost_python.so.0.3.0
\ No newline at end of file diff --git a/test cases/frameworks/35 boost symlinks/boost/lib/libboost_regex.so.0.3.0 b/test cases/frameworks/35 boost symlinks/boost/lib/libboost_regex.so.0.3.0 new file mode 120000 index 0000000..d248bc7 --- /dev/null +++ b/test cases/frameworks/35 boost symlinks/boost/lib/libboost_regex.so.0.3.0 @@ -0,0 +1 @@ +../Cellar/boost/0.3.0/lib/libboost_regex.so.0.3.0
\ No newline at end of file diff --git a/test cases/frameworks/35 boost symlinks/meson.build b/test cases/frameworks/35 boost symlinks/meson.build new file mode 100644 index 0000000..b49a143 --- /dev/null +++ b/test cases/frameworks/35 boost symlinks/meson.build @@ -0,0 +1,6 @@ +project('boosttestsymlinks', 'cpp') + +dep = dependency('boost', modules : ['regex', 'python'], required: false) + +assert(dep.found(), 'expected to find a fake version of boost') +assert(dep.version() == '0.3.0', 'expected to find version 0.3.0') diff --git a/test cases/frameworks/35 boost symlinks/nativefile.ini.in b/test cases/frameworks/35 boost symlinks/nativefile.ini.in new file mode 100644 index 0000000..54510d7 --- /dev/null +++ b/test cases/frameworks/35 boost symlinks/nativefile.ini.in @@ -0,0 +1,2 @@ +[properties] +boost_root = '@MESON_TEST_ROOT@/boost' |