diff options
| author | Brad King <brad.king@kitware.com> | 2020-08-11 12:50:54 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-08-11 12:51:01 (GMT) |
| commit | e524819483cc896745682769c781099c214149bc (patch) | |
| tree | 407bd7e2a7c68c86b42ce8dff42d4f37ad5b2c4e /Tests | |
| parent | b8214a87bf3962029a3d35863ec0187f7c1819d7 (diff) | |
| parent | 5b5be348119859fd83503e163b386603f3e20c6d (diff) | |
| download | CMake-e524819483cc896745682769c781099c214149bc.zip CMake-e524819483cc896745682769c781099c214149bc.tar.gz CMake-e524819483cc896745682769c781099c214149bc.tar.bz2 | |
Merge topic 'automoc-path-prefix-off' into release-3.18
5b5be34811 Help: Add 3.18.2 release note about AUTOMOC_PATH_PREFIX default change
db659e18bc Merge branch 'backport-3.17-automoc-path-prefix-off'
e503fbe38a Merge branch 'backport-3.16-automoc-path-prefix-off'
4c33b305a0 Autogen: Turn off moc path prefix generation by default
56510b7d85 Merge branch 'backport-test-FindPkgConfig-isolate-env' into release-3.17
effc9a1032 Merge branch 'backport-3.17-automoc_timestamp_deps' into release-3.17
507fecd7e2 Merge branch 'ninja-multi-rsp-remove-path' into release-3.17
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5105
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/QtAutogen/MocIncludeSymlink/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Tests/QtAutogen/MocIncludeSymlink/CMakeLists.txt b/Tests/QtAutogen/MocIncludeSymlink/CMakeLists.txt index 1627b39..8b11b46 100644 --- a/Tests/QtAutogen/MocIncludeSymlink/CMakeLists.txt +++ b/Tests/QtAutogen/MocIncludeSymlink/CMakeLists.txt @@ -61,6 +61,7 @@ macro(buildMocInclude sourceDir binaryDir) "${sourceDir}" MocInclude CMAKE_FLAGS "-DQT_TEST_VERSION=${QT_TEST_VERSION}" + "-DCMAKE_AUTOMOC_PATH_PREFIX=ON" "-DCMAKE_AUTOGEN_VERBOSE=${CMAKE_AUTOGEN_VERBOSE}" "-DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}" OUTPUT_VARIABLE output |