From c479dfa7c62a121f360dfa7cea2d5823eb8084e1 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 12 Aug 2017 18:25:56 +0200 Subject: [PATCH] Modified plugin targets for Windows compatibility. --- src/plugins/plugin.pri | 6 +++++- src/plugins/plugin_ut.pri | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/plugins/plugin.pri b/src/plugins/plugin.pri index 1d1002062..c3ba2fe89 100644 --- a/src/plugins/plugin.pri +++ b/src/plugins/plugin.pri @@ -7,4 +7,8 @@ INCLUDEPATH += ../../../db ../../../tl ../../../gsi ../../../laybasic ../../../l DEPENDPATH += ../../../db ../../../tl ../../../gsi ../../../laybasic ../../../lay ../../../common LIBS += -L$$DESTDIR_KLP -lklayout_db -lklayout_tl -lklayout_gsi -lklayout_laybasic -lklayout_lay -QMAKE_POST_LINK += $(COPY) $$OUT_PWD/$${SHLIB_PREFIX}$${TARGET}.$${SHLIB_EXT} $$DESTDIR_KLP/$${TARGET}.klp +isEmpty(DESTDIR) { + QMAKE_POST_LINK += $(COPY) $(TARGET) $$DESTDIR_KLP/$${TARGET}.klp_ut +} else { + QMAKE_POST_LINK += $(COPY) $(DESTDIR_TARGET) $$DESTDIR_KLP/$${TARGET}.klp_ut +} diff --git a/src/plugins/plugin_ut.pri b/src/plugins/plugin_ut.pri index 8be38ed3a..0e3386c85 100644 --- a/src/plugins/plugin_ut.pri +++ b/src/plugins/plugin_ut.pri @@ -7,4 +7,8 @@ INCLUDEPATH += ../src ../../../db ../../../tl ../../../gsi ../../../laybasic ../ DEPENDPATH += ../src ../../../db ../../../tl ../../../gsi ../../../laybasic ../../../lay ../../../common ../../../ut LIBS += -L$$DESTDIR_KLP -lklayout_db -lklayout_tl -lklayout_gsi -lklayout_laybasic -lklayout_lay -lklayout_ut -QMAKE_POST_LINK += $(COPY) $$OUT_PWD/$${SHLIB_PREFIX}$${TARGET}.$${SHLIB_EXT} $$DESTDIR_KLP/$${TARGET}.klp_ut +isEmpty(DESTDIR) { + QMAKE_POST_LINK += $(COPY) $(TARGET) $$DESTDIR_KLP/$${TARGET}.klp_ut +} else { + QMAKE_POST_LINK += $(COPY) $(DESTDIR_TARGET) $$DESTDIR_KLP/$${TARGET}.klp_ut +}