summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorCristian Adam <cristian.adam@qt.io>2021-04-21 19:48:37 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-05-03 18:08:33 +0000
commit9d6245e92184d321338dc8378f1cbaf6a608584a (patch)
treea4b4120450b674bd446cf25d9ffda8a22dd9cd0f /bin
parenta76017b56513ee125cd60cb981c974faffc3df7f (diff)
CMake: Allow usage of QtStandaloneTestTemplateProject as package component
Currently in order to compile a Qt6 test standalone one needs to use the qt-cmake-standalone-test script which will load the Qt6BuildInternals/QtStandaloneTestTemplateProject/CMakeLists.txt project with the current test source directory to create a complete CMake project. This commit will allow a test to have these lines at top: cmake_minimum_required(VERSION 3.16) if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) project(a_qt_test LANGUAGES C CXX ASM) find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) endif() and be standalone and work with any IDE capable of loading CMake projects. Fixes: QTCREATORBUG-25389 Change-Id: If3f878b7e560a8bfbb604a8f1aa30b7962742e66 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 0a1256a52d8c6c1b85a10f7dc94dfc34e3540040) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/qt-cmake-standalone-test.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/qt-cmake-standalone-test.in b/bin/qt-cmake-standalone-test.in
index d13c3eee40..b0fbea5ded 100755
--- a/bin/qt-cmake-standalone-test.in
+++ b/bin/qt-cmake-standalone-test.in
@@ -1,4 +1,4 @@
@__qt_cmake_standalone_test_os_prelude@
@__qt_cmake_standalone_test_script_relpath@
-@__qt_cmake_private_relpath@ @__qt_cmake_standalone_test_relpath@ -DQT_STANDALONE_TEST_PATH=@__qt_cmake_standalone_passed_args@
+@__qt_cmake_private_relpath@ @__qt_cmake_standalone_test_relpath@ -DQT_BUILD_STANDALONE_TESTS=ON -DQT_STANDALONE_TEST_PATH=@__qt_cmake_standalone_passed_args@