Cmake build:

  Supply the correct path to created executable (use ${CMAKE_CFG_INTDIR})

diff --git a/src/tex2lyx/test/CMakeLists.txt b/src/tex2lyx/test/CMakeLists.txt
index ab03c82e2a87537f1d5fc15b56c512577b6f7396..a68e5e60ea609a5d41f6758e53e1914bb4ef3a3f 100644 (file)
--- 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})