From c2365b3b317c3aa7deba11a21f1da5959de30024 Mon Sep 17 00:00:00 2001 From: Thomas Fussell Date: Sat, 11 Mar 2017 17:28:03 -0500 Subject: [PATCH] set dll path before running tests, copy xlnt dll --- .appveyor.yml | 3 ++- .gitignore | 2 ++ tests/CMakeLists.txt | 7 +++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 35037201..8175cf99 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -30,5 +30,6 @@ build: verbosity: minimal test_script: -- cd build/tests +- cd build\tests\Debug +- set PATH=C:\projects\xlnt\vcpkg\installed\x86-windows\debug\bin;%PATH% - xlnt.test.exe diff --git a/.gitignore b/.gitignore index 16a6ffcb..29b572bf 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ node_modules/ #*# *~ .DS_Store +__pycache__/ +Win32/ \ No newline at end of file diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 67df0433..142a7373 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -93,5 +93,12 @@ add_custom_command(OUTPUT ${RUNNER} DEPENDS ${TESTS} COMMENT "Generating test runner ${RUNNER}") +if(NOT STATIC) + add_custom_command(TARGET xlnt.test POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_if_different + $ + $) +endif() + add_custom_target(generate-test-runner DEPENDS ${RUNNER}) add_dependencies(xlnt.test generate-test-runner)