From 4cccbe3e5a72bc38e0dc0066d12237ee1dc92db2 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 13 Jan 2012 09:40:26 +0100 Subject: Fix creation for target directories under Windows. Use backslash and check existence of target directory in pkg.pri. Change-Id: I08d4b571b3f17a59a3fb29355f464e2fa1f615c5 Reviewed-by: Oswald Buddenhagen Reviewed-by: Friedemann Kleint --- pkg.pri | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg.pri b/pkg.pri index 51096de93..3dea0d9d1 100644 --- a/pkg.pri +++ b/pkg.pri @@ -30,10 +30,12 @@ mt { target_dir = $$DESTDIR/$${TARGET}.app/Contents/Resources/qml } else { target_dir = $$DESTDIR/resources/$$CATEGORY/$${TARGET}/qml + target_dir ~= s,/,$$QMAKE_DIR_SEP, } copyqmlinfra.input = QML_INFRA_FILES copyqmlinfra.output = $$target_dir/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT} - copyqmlinfra.commands = $(MKDIR) $$target_dir && $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} + win32: copyqmlinfra.commands = $$QMAKE_CHK_DIR_EXISTS $$target_dir + copyqmlinfra.commands += $(MKDIR) $$target_dir && $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} copyqmlinfra.CONFIG += no_link_no_clean copyqmlinfra.variable_out = POST_TARGETDEPS QMAKE_EXTRA_COMPILERS += copyqmlinfra @@ -59,10 +61,12 @@ mt { target_dir = $$DESTDIR/$${TARGET}.app/Contents/Resources/qml/meshes } else { target_dir = $$DESTDIR/resources/$$CATEGORY/$${TARGET}/qml/meshes + target_dir ~= s,/,$$QMAKE_DIR_SEP, } copyqmlmeshes.input = QML_MESHES_FILES copyqmlmeshes.output = $$target_dir/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT} - copyqmlmeshes.commands = $(MKDIR) $$target_dir && $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} + win32: copyqmlmeshes.commands = $$QMAKE_CHK_DIR_EXISTS $$target_dir + copyqmlmeshes.commands += $(MKDIR) $$target_dir && $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} copyqmlmeshes.CONFIG += no_link_no_cle:qan copyqmlmeshes.variable_out = POST_TARGETDEPS QMAKE_EXTRA_COMPILERS += copyqmlmeshes -- cgit v1.2.3