diff options
Diffstat (limited to '3rdparty/jsoncpp/src/test_lib_json/CMakeLists.txt')
-rw-r--r-- | 3rdparty/jsoncpp/src/test_lib_json/CMakeLists.txt | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/3rdparty/jsoncpp/src/test_lib_json/CMakeLists.txt b/3rdparty/jsoncpp/src/test_lib_json/CMakeLists.txt index 420d659968c..f54c85f6817 100644 --- a/3rdparty/jsoncpp/src/test_lib_json/CMakeLists.txt +++ b/3rdparty/jsoncpp/src/test_lib_json/CMakeLists.txt @@ -1,7 +1,4 @@ - -IF(JSONCPP_LIB_BUILD_SHARED) - ADD_DEFINITIONS( -DJSON_DLL ) -ENDIF(JSONCPP_LIB_BUILD_SHARED) +# vim: et ts=4 sts=4 sw=4 tw=0 ADD_EXECUTABLE( jsoncpp_test jsontest.cpp @@ -9,14 +6,33 @@ ADD_EXECUTABLE( jsoncpp_test main.cpp ) -TARGET_LINK_LIBRARIES(jsoncpp_test jsoncpp_lib) + +IF(BUILD_SHARED_LIBS) + ADD_DEFINITIONS( -DJSON_DLL ) + TARGET_LINK_LIBRARIES(jsoncpp_test jsoncpp_lib) +ELSE(BUILD_SHARED_LIBS) + TARGET_LINK_LIBRARIES(jsoncpp_test jsoncpp_lib_static) +ENDIF(BUILD_SHARED_LIBS) + +# another way to solve issue #90 +#set_target_properties(jsoncpp_test PROPERTIES COMPILE_FLAGS -ffloat-store) # 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 $<TARGET_FILE:jsoncpp_test>) + IF(BUILD_SHARED_LIBS) + # 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 $<TARGET_FILE:jsoncpp_lib> $<TARGET_FILE_DIR:jsoncpp_test> + COMMAND $<TARGET_FILE:jsoncpp_test>) + ELSE(BUILD_SHARED_LIBS) + # Just run the test executable. + ADD_CUSTOM_COMMAND( TARGET jsoncpp_test + POST_BUILD + COMMAND $<TARGET_FILE:jsoncpp_test>) + ENDIF(BUILD_SHARED_LIBS) ENDIF(JSONCPP_WITH_POST_BUILD_UNITTEST) SET_TARGET_PROPERTIES(jsoncpp_test PROPERTIES OUTPUT_NAME jsoncpp_test) |