diff options
| author | Brad King <brad.king@kitware.com> | 2017-07-07 15:44:35 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-07-07 15:44:35 (GMT) |
| commit | 9b9a57e16b22769b612d4bbe45e9b7cb936be690 (patch) | |
| tree | 4b981e6e03920279b789befe7b513769f7cdf57c /Tests | |
| parent | 916b7d519557d4d11e73e66c3e9c95cdacb655ba (diff) | |
| parent | 9a34e95a41fff294a7fcd452cb3e78fd4ff021aa (diff) | |
| download | CMake-9b9a57e16b22769b612d4bbe45e9b7cb936be690.zip CMake-9b9a57e16b22769b612d4bbe45e9b7cb936be690.tar.gz CMake-9b9a57e16b22769b612d4bbe45e9b7cb936be690.tar.bz2 | |
Merge branch 'autogen-no-generated-files' into release-3.9
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/QtAutogen/mocDepends/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/QtAutogen/mocRerun/CMakeLists.txt | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Tests/QtAutogen/mocDepends/CMakeLists.txt b/Tests/QtAutogen/mocDepends/CMakeLists.txt index 8bd72eb..a67dcfe 100644 --- a/Tests/QtAutogen/mocDepends/CMakeLists.txt +++ b/Tests/QtAutogen/mocDepends/CMakeLists.txt @@ -28,6 +28,7 @@ add_executable(mocDepends1 test1.cpp ) target_link_libraries(mocDepends1 ${QT_CORE_TARGET}) set_target_properties(mocDepends1 PROPERTIES AUTOMOC TRUE) +set_property(TARGET mocDepends1 PROPERTY __UNDOCUMENTED_AUTOGEN_GENERATED_FILES 1) # -- Test 2 using generated library # This tests the dependency of AUTOMOC of mocDepends2 to the @@ -43,3 +44,4 @@ add_library(SimpleLib STATIC simpleLib.hpp simpleLib.cpp) add_executable(mocDepends2 test2.cpp ) target_link_libraries(mocDepends2 SimpleLib ${QT_CORE_TARGET}) set_target_properties(mocDepends2 PROPERTIES AUTOMOC TRUE) +set_property(TARGET mocDepends2 PROPERTY __UNDOCUMENTED_AUTOGEN_GENERATED_FILES 1) diff --git a/Tests/QtAutogen/mocRerun/CMakeLists.txt b/Tests/QtAutogen/mocRerun/CMakeLists.txt index 69ea8d7..14b077b 100644 --- a/Tests/QtAutogen/mocRerun/CMakeLists.txt +++ b/Tests/QtAutogen/mocRerun/CMakeLists.txt @@ -27,6 +27,7 @@ add_executable(mocRerun ${CMAKE_CURRENT_BINARY_DIR}/main.cpp res1.qrc ) +set_property(TARGET mocRerun PROPERTY __UNDOCUMENTED_AUTOGEN_GENERATED_FILES 1) target_include_directories(mocRerun PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(mocRerun ${QT_CORE_TARGET}) # Write target name to text file |