From ffec6c7180ce65f3aa20ca3f0016b23b702e73b2 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 25 Jun 2019 09:54:09 +0200 Subject: [PATCH] Add windows batch file for convenient cmake invocation with Qt toolchain file Similar to the shell script, this makes it easier to invoke cmake by just extending your PATH. Change-Id: I1f83e93c507032f6ecf4838c11d62f49f4d93ed6 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor --- bin/qt-cmake.bat.in | 1 + cmake/QtBaseGlobalTargets.cmake | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 bin/qt-cmake.bat.in diff --git a/bin/qt-cmake.bat.in b/bin/qt-cmake.bat.in new file mode 100644 index 0000000000..3f33b4725b --- /dev/null +++ b/bin/qt-cmake.bat.in @@ -0,0 +1 @@ +@CMAKE_COMMAND@ -DCMAKE_TOOLCHAIN_FILE=@CMAKE_INSTALL_PREFIX@/@__GlobalConfig_install_dir@/qt.toolchain.cmake %* diff --git a/cmake/QtBaseGlobalTargets.cmake b/cmake/QtBaseGlobalTargets.cmake index d56cd44cb1..d71065c6d9 100644 --- a/cmake/QtBaseGlobalTargets.cmake +++ b/cmake/QtBaseGlobalTargets.cmake @@ -86,6 +86,9 @@ qt_install(FILES "${__GlobalConfig_build_dir}/qt.toolchain.cmake" DESTINATION "$ if(UNIX) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/qt-cmake.in" "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-cmake" @ONLY) qt_install(PROGRAMS "${QT_BUILD_DIR}/bin/qt-cmake" DESTINATION "${INSTALL_BINDIR}") +else() + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/qt-cmake.bat.in" "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-cmake.bat" @ONLY) + qt_install(PROGRAMS "${QT_BUILD_DIR}/bin/qt-cmake.bat" DESTINATION "${INSTALL_BINDIR}") endif() ## Library to hold global features: