diff options
| author | Brad King <brad.king@kitware.com> | 2017-09-22 14:15:47 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-09-22 14:15:54 (GMT) |
| commit | 7df7eea7cf9c0bcaa7c690a6f56995704c78a7b6 (patch) | |
| tree | 95df6934359165b9935e09259615121ca5c25589 /Tests/QtAutogenRerun/mocPlugin/CMakeLists.txt | |
| parent | 33eec572328847da74f87c99bde3c5f0eef992bb (diff) | |
| parent | 51fd7b714ba518e70f4aa192b1d39e32eea79aef (diff) | |
| download | CMake-7df7eea7cf9c0bcaa7c690a6f56995704c78a7b6.zip CMake-7df7eea7cf9c0bcaa7c690a6f56995704c78a7b6.tar.gz CMake-7df7eea7cf9c0bcaa7c690a6f56995704c78a7b6.tar.bz2 | |
Merge topic 'autogen-generators-refactor'
51fd7b71 Autogen: Tests: Add a change-not test to the mocRerun test
c8f92db7 Autogen: Tests: Disable an AUTOMOC_DEPENDS_FILTER test for Ninja
3c77515e Autogen: Tests: Refactor the QtAutogenRebuild rccDepends test
04a0daee Autogen: Tests: Move each rerun test script to a NAME.cmake file
e5c6610a Autogen: Tests: Extend CMAKE_AUTOMOC_DEPEND_FILTERS rebuild test
93265652 Autogen: Tests: Add <SUBDIR>/ui_view.h AUTOUIC includes to sameName test
4eb7d817 Autogen: Tests: Add <SUBDIR>/item.moc includes to sameName test
3f223743 Autogen: Read relative paths from rcc output
...
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1244
Diffstat (limited to 'Tests/QtAutogenRerun/mocPlugin/CMakeLists.txt')
| -rw-r--r-- | Tests/QtAutogenRerun/mocPlugin/CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Tests/QtAutogenRerun/mocPlugin/CMakeLists.txt b/Tests/QtAutogenRerun/mocPlugin/CMakeLists.txt index 9b224fb..b7cc5e9 100644 --- a/Tests/QtAutogenRerun/mocPlugin/CMakeLists.txt +++ b/Tests/QtAutogenRerun/mocPlugin/CMakeLists.txt @@ -16,9 +16,11 @@ if(Qt5_POSITION_INDEPENDENT_CODE AND CMAKE_CXX_COMPILE_OPTIONS_PIC) endif() configure_file(jsonIn/StyleC.json jsonFiles/StyleC.json) -configure_file(jsonIn/StyleD.json jsonFiles/sub/StyleD.json) configure_file(jsonIn/StyleC.json jsonFiles/StyleC_Custom.json) +configure_file(jsonIn/StyleD.json jsonFiles/sub/StyleD.json) configure_file(jsonIn/StyleD.json jsonFiles/sub/StyleD_Custom.json) +configure_file(jsonIn/StyleE.json jsonFiles/StyleE.json) +configure_file(jsonIn/StyleE.json jsonFiles/StyleE_Custom.json) # Enable automoc set(CMAKE_AUTOMOC TRUE) |