From a9159a7bf79c4b8c7bad37ac2589b473a74db7eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Mon, 25 Jan 2021 11:00:11 +0100 Subject: Forward QTC_MERGE_BINARY_DIR to subprojects Change-Id: Ie6b3aef8cdc59f29450aa773751e9994264e46e8 Reviewed-by: Eike Ziller --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 012e0a6..20e46a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,5 +59,7 @@ ExternalProject_Add(plugin -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH_ALT_SEP} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} + -DQtCreator_BINARY_DIR:PATH=${QtCreator_BINARY_DIR} + -DQTC_MERGE_BINARY_DIR:BOOL=${QTC_MERGE_BINARY_DIR} DEPENDS kuserfeedback ) -- cgit v1.2.3 From cc31b7d481aa0fae9b661407aa0c98d2504ff966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Wed, 10 Feb 2021 18:06:49 +0100 Subject: Always build telemetry plugin Make sure the plugin is build not only the first time, but on each build run. Change-Id: Ie1035b72fdd9da8cc720c2d811c2734f15ec908d Reviewed-by: Eike Ziller --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 20e46a7..d8f7adc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,4 +62,5 @@ ExternalProject_Add(plugin -DQtCreator_BINARY_DIR:PATH=${QtCreator_BINARY_DIR} -DQTC_MERGE_BINARY_DIR:BOOL=${QTC_MERGE_BINARY_DIR} DEPENDS kuserfeedback + BUILD_ALWAYS ON ) -- cgit v1.2.3