diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-12-11 23:55:25 -0800 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-12-12 17:15:27 +0000 |
| commit | 9355236641a6a60826d654058c199db9294a4b4f (patch) | |
| tree | 390d19ed666e65cedb14c121802ac8080ee92785 /static.pro | |
| parent | 1004b667615817a281729443490c906f76f0bd33 (diff) | |
Fix in-source qmake builds
This is primarily relevant for macOS, where the dmgbuild script and
Python modules must be present for certain features to work.
Change-Id: I57e36d9deed2c6d810e77075cce8364678facc09
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'static.pro')
| -rw-r--r-- | static.pro | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/static.pro b/static.pro index 39ffb387f..b0ab1b950 100644 --- a/static.pro +++ b/static.pro @@ -39,30 +39,28 @@ OTHER_FILES += $$FILES $$LIBEXEC_FILES copy2build.name = COPY ${QMAKE_FILE_IN} copy2build.CONFIG += no_link target_predeps QMAKE_EXTRA_COMPILERS += copy2build - - copy2build_python.input = PYTHON_FILES - !isEmpty(QBS_RESOURCES_BUILD_DIR): \ - copy2build_python.output = \ - $${QBS_RESOURCES_BUILD_DIR}/share/qbs/python/${QMAKE_FUNC_FILE_IN_stripPythonSrcDir} - else: \ - copy2build_python.output = share/qbs/python/${QMAKE_FUNC_FILE_IN_stripPythonSrcDir} - copy2build_python.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} - copy2build_python.name = COPY ${QMAKE_FILE_IN} - copy2build_python.CONFIG += no_link target_predeps - QMAKE_EXTRA_COMPILERS += copy2build_python } -!isEqual(PWD, $$OUT_PWD) { - libexec_copy.input = LIBEXEC_FILES - !isEmpty(QBS_LIBEXEC_DESTDIR): \ - libexec_copy.output = $${QBS_LIBEXEC_DESTDIR}/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT} - else: \ - libexec_copy.output = libexec/qbs/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT} - libexec_copy.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} - libexec_copy.name = COPY ${QMAKE_FILE_IN} - libexec_copy.CONFIG += no_link target_predeps - QMAKE_EXTRA_COMPILERS += libexec_copy -} +copy2build_python.input = PYTHON_FILES +!isEmpty(QBS_RESOURCES_BUILD_DIR): \ + copy2build_python.output = \ + $${QBS_RESOURCES_BUILD_DIR}/share/qbs/python/${QMAKE_FUNC_FILE_IN_stripPythonSrcDir} +else: \ + copy2build_python.output = share/qbs/python/${QMAKE_FUNC_FILE_IN_stripPythonSrcDir} +copy2build_python.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} +copy2build_python.name = COPY ${QMAKE_FILE_IN} +copy2build_python.CONFIG += no_link target_predeps +QMAKE_EXTRA_COMPILERS += copy2build_python + +libexec_copy.input = LIBEXEC_FILES +!isEmpty(QBS_LIBEXEC_DESTDIR): \ + libexec_copy.output = $${QBS_LIBEXEC_DESTDIR}/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT} +else: \ + libexec_copy.output = libexec/qbs/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT} +libexec_copy.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} +libexec_copy.name = COPY ${QMAKE_FILE_IN} +libexec_copy.CONFIG += no_link target_predeps +QMAKE_EXTRA_COMPILERS += libexec_copy include(src/install_prefix.pri) |