[dia: 84/105] #19: Append build_root()/lib to PATH for tests on Windows.



commit ca6a8477975385365d81f1a016d24b49b04f442b
Author: Eduard Nicodei <eddnicodei gmail com>
Date:   Sat Jan 19 21:27:02 2019 +0000

    #19: Append build_root()/lib to PATH for tests on Windows.
    
      - This fixes issue where user had to manually specify it in order
        to run tests.

 tests/meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/tests/meson.build b/tests/meson.build
index 35af3555..87306e79 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -27,9 +27,9 @@ objs = executable(
     include_directories: [configuration_inc, libdia_inc],
 )
 
-# TODO: is there a FIXME for this?  Windows and its lack of LD_RUN_PATH?
+# Otherwise Windows won't be able to find libdia.dll in build directory.
 if host_machine.system() == 'windows'
-    warning('Because windows searches for .dlls in specific locations, i.e. PATH variable, it is *required* 
that you set PATH=MESON_BUILD_DIR/lib:$PATH *before* running any tests.  This ensures Windows can find 
libdia.dll.')
+    run_env.append('PATH', join_paths(meson.build_root(), 'lib'))
 endif
 
 tsvg = executable(


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]