diff options
| author | Brad King <brad.king@kitware.com> | 2021-02-24 14:44:54 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-02-24 14:44:59 (GMT) |
| commit | 261ba006682a064177fc1d9beee9c5ec0f3ea378 (patch) | |
| tree | 93e89b2ea2ff5c11ac467dd52e9d4cc5fefbd473 /Tests/RunCMake/Ninja | |
| parent | 9569b3f43755e03d4f5d618a8c37005bb761816a (diff) | |
| parent | 339dbc901f04369e997d8d65b60380d6255e5f10 (diff) | |
| download | CMake-261ba006682a064177fc1d9beee9c5ec0f3ea378.zip CMake-261ba006682a064177fc1d9beee9c5ec0f3ea378.tar.gz CMake-261ba006682a064177fc1d9beee9c5ec0f3ea378.tar.bz2 | |
Merge topic 'autogen-cmp0116-fix' into release-3.20
339dbc901f Help: Note that CMP0116 is recorded at the time of CC creation
e3740e020e Tests: Test Qt autogen target with CMP0116 set to WARN
cf34011ce7 Tests: Test per-CC behavior of CMP0116
3a95503512 Ninja: Use CMP0116 status recorded at time of custom command's creation
f01f10e8fb cmCustomCommand: Record value of CMP0116 at time of creation
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5848
Diffstat (limited to 'Tests/RunCMake/Ninja')
| -rw-r--r-- | Tests/RunCMake/Ninja/Qt5AutoMocDeps.cmake | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/Ninja/QtSubDir3/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Tests/RunCMake/Ninja/Qt5AutoMocDeps.cmake b/Tests/RunCMake/Ninja/Qt5AutoMocDeps.cmake index d314ff3..7456608 100644 --- a/Tests/RunCMake/Ninja/Qt5AutoMocDeps.cmake +++ b/Tests/RunCMake/Ninja/Qt5AutoMocDeps.cmake @@ -10,3 +10,4 @@ target_link_libraries(app_with_qt PRIVATE simple_lib Qt5::Core) add_subdirectory(QtSubDir1) add_subdirectory(QtSubDir2) +add_subdirectory(QtSubDir3) diff --git a/Tests/RunCMake/Ninja/QtSubDir3/CMakeLists.txt b/Tests/RunCMake/Ninja/QtSubDir3/CMakeLists.txt new file mode 100644 index 0000000..d38cfe0 --- /dev/null +++ b/Tests/RunCMake/Ninja/QtSubDir3/CMakeLists.txt @@ -0,0 +1,2 @@ +add_executable(sub_exe_3 ../app.cpp) +target_link_libraries(sub_exe_3 PRIVATE Qt5::Core) |