Add dir support for find_library and remove deprecated standalone version. Closes #450.

2 files changed, 13 insertions, 14 deletions

diff --git a/test cases/frameworks/4 qt5/meson.build b/test cases/frameworks/4 qt5/meson.build
index bce9dbd..cfea5ba 100644
--- a/test cases/frameworks/4 qt5/meson.build
+++ b/test cases/frameworks/4 qt5/meson.build
@@ -4,15 +4,15 @@ qt5 = import('qt5')
 qt5dep = dependency('qt5', modules : ['Core', 'Gui', 'Widgets'])
 
 prep = qt5.preprocess(
-moc_headers : ['mainWindow.h'], # These need to be fed through the moc tool before use. 
-ui_files : 'mainWindow.ui',     # XML files that need to be compiled with the uic tol.
-qresources : 'stuff.qrc',       # Resource file for rcc compiler.
+  moc_headers : ['mainWindow.h'], # These need to be fed through the moc tool before use. 
+  ui_files : 'mainWindow.ui',     # XML files that need to be compiled with the uic tol.
+  qresources : 'stuff.qrc',       # Resource file for rcc compiler.
 )
 
 q5exe = executable('qt5app',
-sources : ['main.cpp', 'mainWindow.cpp', # Sources that don't need preprocessing.
-prep],
-dependencies : qt5dep)
+  sources : ['main.cpp', 'mainWindow.cpp', # Sources that don't need preprocessing.
+  prep],
+  dependencies : qt5dep)
 
 # We need a console test application because some test environments
 # do not have an X server.
@@ -20,7 +20,7 @@ dependencies : qt5dep)
 qt5core = dependency('qt5', modules : 'Core')
 
 qt5coreapp = executable('q5core', 'q5core.cpp',
-dependencies : qt5core)
+  dependencies : qt5core)
 
 test('qt5test', qt5coreapp)
 
@@ -28,11 +28,11 @@ test('qt5test', qt5coreapp)
 # headers but the user must manually include moc
 # files from sources.
 manpreprocessed = qt5.preprocess(
-moc_sources : 'manualinclude.cpp',
-moc_headers : 'manualinclude.h')
+  moc_sources : 'manualinclude.cpp',
+  moc_headers : 'manualinclude.h')
 
 q5maninclude = executable('q5maninclude',
-sources : ['manualinclude.cpp', manpreprocessed],
-dependencies : qt5core)
+  sources : ['manualinclude.cpp', manpreprocessed],
+  dependencies : qt5core)
 
 test('q5maninclude', q5maninclude)
diff --git a/test cases/linuxlike/2 external library/meson.build b/test cases/linuxlike/2 external library/meson.build
index f83affc..5839c1a 100644
--- a/test cases/linuxlike/2 external library/meson.build
+++ b/test cases/linuxlike/2 external library/meson.build
@@ -1,8 +1,7 @@
 project('external library', 'c')
 
 cc = meson.get_compiler('c')
-zlib = find_library('z') # DEPRECATED
-zlib2 = cc.find_library('z') # The modern way.
+zlib = cc.find_library('z')
 
 # Verify that link testing works.
 linkcode = '''#include<zlib.h>
@@ -25,7 +24,7 @@ assert(not cc.links(nolinkcode, name : 'Failing link'), 'Linking succeeded when
 e = executable('zprog', 'prog.c', dependencies : zlib)
 test('libtest', e)
 
-e2 = executable('zprog_alt', 'prog.c', dependencies : zlib2)
+e2 = executable('zprog_alt', 'prog.c', dependencies : zlib)
 test('libtest_alt', e2)
 
 # Test that ext deps work via an internal dep.