diff options
| author | kcgen <kcgen@users.noreply.github.com> | 2022-08-29 08:58:47 +0300 |
|---|---|---|
| committer | kcgen <1557255+kcgen@users.noreply.github.com> | 2022-08-29 09:15:16 +0300 |
| commit | 321ccfba88ab8cc77fad0cbc67f0a13adab05363 (patch) | |
| tree | 6b58a16c00ea00881e83324b1bdb32e7cf33eca0 /tests | |
| parent | 4c37e9ec3cd4ef54c979590249f3961548a14ff7 (diff) | |
Avoid archiving single objects
This cleanups a handful of "empty table" warnings generated
by ranlib on macos.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/meson.build | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tests/meson.build b/tests/meson.build index ec179d178..345f7e7a1 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -43,7 +43,7 @@ endforeach example = executable( 'example', ['example_tests.cpp', 'stubs.cpp'], - dependencies: [gmock_dep, libmisc_dep, libghc_dep, libloguru_dep], + dependencies: [gmock_dep, libmisc_dep, ghc_dep, libloguru_dep], include_directories: incdir, cpp_args: cpp_args, ) @@ -52,7 +52,7 @@ test('gtest example', example, should_fail: true) fs_utils = executable( 'fs_utils', ['fs_utils_tests.cpp', 'stubs.cpp'], - dependencies: [gmock_dep, libmisc_dep, libghc_dep, libloguru_dep], + dependencies: [gmock_dep, libmisc_dep, ghc_dep, libloguru_dep], include_directories: incdir, cpp_args: cpp_args, ) @@ -84,7 +84,10 @@ unit_tests = [ extra_link_flags = [] if get_option('b_pie') == false - extra_link_flags += ['-no-pie'] + no_pie = '-no-pie' + if host_machine.system() != 'darwin' and cxx.has_link_argument(no_pie) + extra_link_flags += no_pie + endif endif foreach ut : unit_tests @@ -93,8 +96,8 @@ foreach ut : unit_tests exe = executable( name, [name + '_tests.cpp'] + extra_cpp, + dependencies: [gmock_dep, ghc_dep, libloguru_dep] + ut.get('deps'), link_args: extra_link_flags, - dependencies: [gmock_dep, libghc_dep, libloguru_dep] + ut.get('deps'), include_directories: incdir, cpp_args: cpp_args, ) |