diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-02-23 09:16:02 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-02-23 09:16:02 +0100 |
| commit | 6c639303d61f2138df527a688253f31beb90cc52 (patch) | |
| tree | 22675f665277ca32100f636e767285e3fdeba3d0 | |
| parent | 176360861f6f3d79cbf99f88ee936dede10a8ff7 (diff) | |
| parent | cc31b7d481aa0fae9b661407aa0c98d2504ff966 (diff) | |
Merge remote-tracking branch 'origin/4.14'
Change-Id: I9cbd7a96083899497a15b084c76c6e3a7470557a
| -rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 012e0a6..d8f7adc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,5 +59,8 @@ 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 + BUILD_ALWAYS ON ) |