From 1822a106396292fa36148d3ca0bc5e815535805d Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Sat, 20 Oct 2012 15:27:30 +0200 Subject: [PATCH] Cmake build: Supply the correct path to created executable (use ${CMAKE_CFG_INTDIR}) --- src/tex2lyx/test/CMakeLists.txt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/tex2lyx/test/CMakeLists.txt b/src/tex2lyx/test/CMakeLists.txt index ab03c82e2a..a68e5e60ea 100644 --- a/src/tex2lyx/test/CMakeLists.txt +++ b/src/tex2lyx/test/CMakeLists.txt @@ -8,9 +8,6 @@ project(test) set(_test_depend "test.ltx") set(_test_output) -#foreach(_arg runtests.py DummyDocument.tex test.ltx foo.eps foo.png) -# configure_file("${TOP_SRC_DIR}/src/tex2lyx/test/${_arg}" "${CMAKE_CURRENT_BINARY_DIR}/${_arg}" COPYONLY) -#endforeach(_arg) foreach(_arg test-structure test-insets box-color-size-space-align CJK XeTeX-polyglossia) list(APPEND _test_depend "${TOP_SRC_DIR}/src/tex2lyx/test/${_arg}.tex") @@ -21,10 +18,16 @@ endforeach(_arg) ADD_CUSTOM_COMMAND( OUTPUT ${_test_output} COMMAND ${LYX_PYTHON_EXECUTABLE} - ARGS "${TOP_SRC_DIR}/src/tex2lyx/test/runtests.py" "${TOP_BINARY_DIR}/bin/${_tex2lyx}" "${TOP_SRC_DIR}/lib/scripts" "${CMAKE_CURRENT_BINARY_DIR}" + ARGS "${TOP_SRC_DIR}/src/tex2lyx/test/runtests.py" + "${TOP_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/${_tex2lyx}" + "${TOP_SRC_DIR}/lib/scripts" + "${CMAKE_CURRENT_BINARY_DIR}" WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" DEPENDS ${_tex2lyx} ${_test_depend} - COMMENT "${LYX_PYTHON_EXECUTABLE}" "${TOP_SRC_DIR}/src/tex2lyx/test/runtests.py" "${TOP_BINARY_DIR}/bin/${_tex2lyx}" "${TOP_SRC_DIR}/lib/scripts" "${CMAKE_CURRENT_BINARY_DIR}" + COMMENT "${LYX_PYTHON_EXECUTABLE}" "${TOP_SRC_DIR}/src/tex2lyx/test/runtests.py" + "${TOP_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/${_tex2lyx}" + "${TOP_SRC_DIR}/lib/scripts" + "${CMAKE_CURRENT_BINARY_DIR}" ) ADD_CUSTOM_TARGET(test DEPENDS ${_tex2lyx} ${_lyx} ${_test_output}) -- 2.39.2