From 13e063c336facbb2d32b6f3128a2ddf1f48f823b Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Thu, 5 Mar 2015 14:57:41 -0600 Subject: [PATCH] copy .dll for unit-test Fix 2nd problem in issue #200. * http://stackoverflow.com/questions/10671916/how-to-copy-dll-files-into-the-same-folder-as-the-executable-using-cmake Q: What about the Python tests? A: They are not normally run in Visual Studio. If desired, one can set PATH. --- src/test_lib_json/CMakeLists.txt | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/test_lib_json/CMakeLists.txt b/src/test_lib_json/CMakeLists.txt index df5a924..f925ce0 100644 --- a/src/test_lib_json/CMakeLists.txt +++ b/src/test_lib_json/CMakeLists.txt @@ -1,3 +1,4 @@ +# vim: et ts=4 sts=4 sw=4 tw=0 IF(JSONCPP_LIB_BUILD_SHARED) ADD_DEFINITIONS( -DJSON_DLL ) @@ -22,9 +23,19 @@ ENDIF(JSONCPP_LIB_BUILD_SHARED) # Run unit tests in post-build # (default cmake workflow hides away the test result into a file, resulting in poor dev workflow?!?) IF(JSONCPP_WITH_POST_BUILD_UNITTEST) - ADD_CUSTOM_COMMAND( TARGET jsoncpp_test - POST_BUILD - COMMAND $) + IF(JSONCPP_LIB_BUILD_SHARED) + # First, copy the shared lib, for Microsoft. + # Then, run the test executable. + ADD_CUSTOM_COMMAND( TARGET jsoncpp_test + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_if_different $ $ + COMMAND $) + ELSE(JSONCPP_LIB_BUILD_SHARED) + # Just run the test executable. + ADD_CUSTOM_COMMAND( TARGET jsoncpp_test + POST_BUILD + COMMAND $) + ENDIF(JSONCPP_LIB_BUILD_SHARED) ENDIF(JSONCPP_WITH_POST_BUILD_UNITTEST) SET_TARGET_PROPERTIES(jsoncpp_test PROPERTIES OUTPUT_NAME jsoncpp_test)