diff options
| author | Brad King <brad.king@kitware.com> | 2017-08-07 14:34:45 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-08-07 14:34:48 (GMT) |
| commit | 3a0ef7ac1a50383331f92a19926682d5c1f2682a (patch) | |
| tree | 5665133e96c4ac72bd51d13c4a9257abc9cbeee1 /Tests/QtAutogen/mocInclude/shared.cmake | |
| parent | 1f20aff2a69160c36002781ed91b6998fc4587ac (diff) | |
| parent | 5150c3527df55f84e896177f6bbec0315d6c1349 (diff) | |
| download | CMake-3a0ef7ac1a50383331f92a19926682d5c1f2682a.zip CMake-3a0ef7ac1a50383331f92a19926682d5c1f2682a.tar.gz CMake-3a0ef7ac1a50383331f92a19926682d5c1f2682a.tar.bz2 | |
Merge topic 'autogen-configs'
5150c352 Autogen: Add release notes for per-config include dir
ccc98b5c Autogen: Update documentation for per-config include dir
a13716a5 Autogen: Enable per-config support
6d83757f Autogen: Generate rcc wrapper file on demand
74a1b8eb Autogen: Fix configuration suffix initialization
ddd6f0db Autogen: Add per-config suffix to moc_predefs.h
e2c9cf12 Autogen: Remove per-config suffix for mocs_compilations.cpp
3a4840e0 Autogen: Make test per-config include directory compatible
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1107
Diffstat (limited to 'Tests/QtAutogen/mocInclude/shared.cmake')
| -rw-r--r-- | Tests/QtAutogen/mocInclude/shared.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Tests/QtAutogen/mocInclude/shared.cmake b/Tests/QtAutogen/mocInclude/shared.cmake index c426050..d05f27c 100644 --- a/Tests/QtAutogen/mocInclude/shared.cmake +++ b/Tests/QtAutogen/mocInclude/shared.cmake @@ -29,9 +29,11 @@ set_property(SOURCE ${CMAKE_CURRENT_BINARY_DIR}/SObjB.cpp PROPERTY SKIP_AUTOMOC qtx_generate_moc( ${CMAKE_CURRENT_SOURCE_DIR}/../mocInclude/SObjCExtra.hpp ${CMAKE_CURRENT_BINARY_DIR}/SObjCExtra_extMoc.cpp) -set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/../mocInclude/SObjCExtra.hpp PROPERTY SKIP_AUTOMOC ON) +set_property( + SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/../mocInclude/SObjCExtra.hpp + PROPERTY SKIP_AUTOMOC ON) # Custom target to depend on -set(SOBJC_MOC ${CMAKE_CURRENT_BINARY_DIR}/${MOC_INCLUDE_NAME}_autogen/include/moc_SObjCExtra.cpp) +set(SOBJC_MOC ${CMAKE_CURRENT_BINARY_DIR}/moc_SObjCExtra.cpp) add_custom_target("${MOC_INCLUDE_NAME}_SOBJC" DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/SObjCExtra_extMoc.cpp BYPRODUCTS ${SOBJC_MOC} |