diff options
| author | Aleix Pol <aleixpol@kde.org> | 2017-10-08 19:49:46 +0200 |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2017-11-13 15:58:43 +0100 |
| commit | 9993337d0c8dd8831f6e14a4c5b186af568e895d (patch) | |
| tree | ca845a0859815d91d452ac9dada67ed44f076b5b | |
| parent | 7c4d8cc30df2c4838ee08478e7750fa439c04d0b (diff) | |
| download | extra-cmake-modules-9993337d0c8dd8831f6e14a4c5b186af568e895d.tar.gz extra-cmake-modules-9993337d0c8dd8831f6e14a4c5b186af568e895d.tar.bz2 | |
Only pass the ARGS thing when doing Makefiles
Ninja chokes on the $
| -rw-r--r-- | toolchain/Android.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/toolchain/Android.cmake b/toolchain/Android.cmake index 201880fd..3c587fa4 100644 --- a/toolchain/Android.cmake +++ b/toolchain/Android.cmake @@ -237,13 +237,17 @@ if(DEFINED QTANDROID_EXPORTED_TARGET AND NOT TARGET ${CREATEAPK_TARGET_NAME}) set(EXECUTABLE_DESTINATION_PATH "${EXPORT_DIR}/libs/${ANDROID_ABI}/lib${QTANDROID_EXPORTED_TARGET}.so") configure_file("${_CMAKE_ANDROID_DIR}/deployment-file.json.in" "${QTANDROID_EXPORTED_TARGET}-deployment.json.in") + if (CMAKE_GENERATOR STREQUAL "Unix Makefiles") + set(arguments "\\$(ARGS)") + endif() + add_custom_target(${CREATEAPK_TARGET_NAME} COMMAND cmake -E echo "Generating $<TARGET_NAME:${QTANDROID_EXPORTED_TARGET}> with $<TARGET_FILE_DIR:Qt5::qmake>/androiddeployqt" COMMAND cmake -E remove_directory "${EXPORT_DIR}" COMMAND cmake -E copy_directory "${ANDROID_APK_DIR}" "${EXPORT_DIR}" COMMAND cmake -E copy "$<TARGET_FILE:${QTANDROID_EXPORTED_TARGET}>" "${EXECUTABLE_DESTINATION_PATH}" COMMAND cmake -DINPUT_FILE="${QTANDROID_EXPORTED_TARGET}-deployment.json.in" -DOUTPUT_FILE="${QTANDROID_EXPORTED_TARGET}-deployment.json" "-DTARGET_DIR=$<TARGET_FILE_DIR:${QTANDROID_EXPORTED_TARGET}>" "-DTARGET_NAME=${QTANDROID_EXPORTED_TARGET}" "-DEXPORT_DIR=${CMAKE_INSTALL_PREFIX}" -P ${_CMAKE_ANDROID_DIR}/specifydependencies.cmake - COMMAND $<TARGET_FILE_DIR:Qt5::qmake>/androiddeployqt --gradle --input "${QTANDROID_EXPORTED_TARGET}-deployment.json" --output "${EXPORT_DIR}" --deployment bundled "\\$(ARGS)" + COMMAND $<TARGET_FILE_DIR:Qt5::qmake>/androiddeployqt --gradle --input "${QTANDROID_EXPORTED_TARGET}-deployment.json" --output "${EXPORT_DIR}" --deployment bundled ${arguments} ) add_custom_target(install-apk-${QTANDROID_EXPORTED_TARGET} |