From 81d16dfda10f4923e564252a0f7cd483c407705a Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Mon, 11 Aug 2014 01:42:37 +0400 Subject: [PATCH] Fixed deprecated target file path location --- src/jsontestrunner/CMakeLists.txt | 3 +-- src/test_lib_json/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/jsontestrunner/CMakeLists.txt b/src/jsontestrunner/CMakeLists.txt index 7ab2f0031..dd8e2175f 100644 --- a/src/jsontestrunner/CMakeLists.txt +++ b/src/jsontestrunner/CMakeLists.txt @@ -12,11 +12,10 @@ SET_TARGET_PROPERTIES(jsontestrunner_exe PROPERTIES OUTPUT_NAME jsontestrunner_e IF(PYTHONINTERP_FOUND) # Run end to end parser/writer tests - GET_PROPERTY(JSONTESTRUNNER_EXE_PATH TARGET jsontestrunner_exe PROPERTY LOCATION) SET(TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../test) SET(RUNJSONTESTS_PATH ${TEST_DIR}/runjsontests.py) ADD_CUSTOM_TARGET(jsoncpp_readerwriter_tests ALL - "${PYTHON_EXECUTABLE}" -B "${RUNJSONTESTS_PATH}" "${JSONTESTRUNNER_EXE_PATH}" "${TEST_DIR}/data" + "${PYTHON_EXECUTABLE}" -B "${RUNJSONTESTS_PATH}" $ "${TEST_DIR}/data" DEPENDS jsontestrunner_exe jsoncpp_test ) ADD_CUSTOM_TARGET(jsoncpp_check DEPENDS jsoncpp_readerwriter_tests) diff --git a/src/test_lib_json/CMakeLists.txt b/src/test_lib_json/CMakeLists.txt index 7fb5602e1..420d65996 100644 --- a/src/test_lib_json/CMakeLists.txt +++ b/src/test_lib_json/CMakeLists.txt @@ -15,8 +15,8 @@ TARGET_LINK_LIBRARIES(jsoncpp_test jsoncpp_lib) # (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 jsoncpp_test) + POST_BUILD + COMMAND $) ENDIF(JSONCPP_WITH_POST_BUILD_UNITTEST) SET_TARGET_PROPERTIES(jsoncpp_test PROPERTIES OUTPUT_NAME jsoncpp_test)