From b9b2887686d4a15defa4257fd76ac47a1ef69dfc Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 19 Aug 2020 10:37:26 +0200 Subject: [PATCH] CMake build: Fix copying of external tools Fixes: QTCREATORBUG-24509 Change-Id: Ic19adf009bba326a2b9e59fe561e4021bbf21412 Reviewed-by: Christian Stenger --- .../qtcreator/externaltools/CMakeLists.txt | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/src/share/qtcreator/externaltools/CMakeLists.txt b/src/share/qtcreator/externaltools/CMakeLists.txt index bf9f2167874..dcd107ef354 100644 --- a/src/share/qtcreator/externaltools/CMakeLists.txt +++ b/src/share/qtcreator/externaltools/CMakeLists.txt @@ -1,13 +1,20 @@ set(EXT_TOOLS_DIR "${IDE_DATA_PATH}/externaltools") -install(FILES lrelease.xml lupdate.xml qmlscene.xml qmlviewer.xml +set(tools lrelease.xml lupdate.xml qmlscene.xml qmlviewer.xml) + +if (WIN32) + list(APPEND tools notepad_win.xml) +elseif (APPLE) + list(APPEND tools vi_mac.xml) +else() + list(APPEND tools vi.xml) +endif() + +qtc_copy_to_builddir(copy_src_share_to_builddir + FILES ${tools} DESTINATION "${EXT_TOOLS_DIR}" ) -if (WIN32) - install(FILES notepad_win.xml DESTINATION "${EXT_TOOLS_DIR}") -elseif (APPLE) - install(FILES vi_mac.xml DESTINATION "${EXT_TOOLS_DIR}") -else() - install(FILES vi.xml DESTINATION "${EXT_TOOLS_DIR}") -endif() +install(FILES ${tools} + DESTINATION "${EXT_TOOLS_DIR}" +)