Skip to content

Commit 1ac2295

Browse files
committed
Merge pull request open-source-parsers#27 from egor-tensin/master
Fixed deprecated target file path location +1 for fixing indentation!
2 parents c138933 + 81d16df commit 1ac2295

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

src/jsontestrunner/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@ SET_TARGET_PROPERTIES(jsontestrunner_exe PROPERTIES OUTPUT_NAME jsontestrunner_e
1212

1313
IF(PYTHONINTERP_FOUND)
1414
# Run end to end parser/writer tests
15-
GET_PROPERTY(JSONTESTRUNNER_EXE_PATH TARGET jsontestrunner_exe PROPERTY LOCATION)
1615
SET(TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../test)
1716
SET(RUNJSONTESTS_PATH ${TEST_DIR}/runjsontests.py)
1817
ADD_CUSTOM_TARGET(jsoncpp_readerwriter_tests ALL
19-
"${PYTHON_EXECUTABLE}" -B "${RUNJSONTESTS_PATH}" "${JSONTESTRUNNER_EXE_PATH}" "${TEST_DIR}/data"
18+
"${PYTHON_EXECUTABLE}" -B "${RUNJSONTESTS_PATH}" $<TARGET_FILE:jsontestrunner_exe> "${TEST_DIR}/data"
2019
DEPENDS jsontestrunner_exe jsoncpp_test
2120
)
2221
ADD_CUSTOM_TARGET(jsoncpp_check DEPENDS jsoncpp_readerwriter_tests)

src/test_lib_json/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ TARGET_LINK_LIBRARIES(jsoncpp_test jsoncpp_lib)
1515
# (default cmake workflow hides away the test result into a file, resulting in poor dev workflow?!?)
1616
IF(JSONCPP_WITH_POST_BUILD_UNITTEST)
1717
ADD_CUSTOM_COMMAND( TARGET jsoncpp_test
18-
POST_BUILD
19-
COMMAND jsoncpp_test)
18+
POST_BUILD
19+
COMMAND $<TARGET_FILE:jsoncpp_test>)
2020
ENDIF(JSONCPP_WITH_POST_BUILD_UNITTEST)
2121

2222
SET_TARGET_PROPERTIES(jsoncpp_test PROPERTIES OUTPUT_NAME jsoncpp_test)

0 commit comments

Comments
 (0)