aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Holtermann <sebholt@xwmw.org>2017-06-30 15:25:15 +0200
committerDavid Faure <faure@kde.org>2017-07-01 13:57:07 +0200
commitaa17dcf852e781df4613c91e46b36ea946aba7ec (patch)
treece5eb1054efc525567cbcae8ffd3d13ec97aeda1
parent66ee6ba6bfd23225dd9d335e1ce4ef3c8000e745 (diff)
downloadkconfig-aa17dcf852e781df4613c91e46b36ea946aba7ec.tar.gz
kconfig-aa17dcf852e781df4613c91e46b36ea946aba7ec.tar.bz2
Fix for CMake 3.9.
AUTOMOC now applies to generated headers too, so we need to skip it when using qt5_generate_moc.
-rw-r--r--KF5ConfigMacros.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/KF5ConfigMacros.cmake b/KF5ConfigMacros.cmake
index f365c78f..527054da 100644
--- a/KF5ConfigMacros.cmake
+++ b/KF5ConfigMacros.cmake
@@ -98,6 +98,7 @@ function (KCONFIG_ADD_KCFG_FILES _sources )
if(ARG_GENERATE_MOC)
list(APPEND sources ${_moc_FILE})
qt5_generate_moc(${_header_FILE} ${_moc_FILE})
+ set_property(SOURCE ${_header_FILE} PROPERTY SKIP_AUTOMOC TRUE) # don't run automoc on this file
set_property(SOURCE ${_src_FILE} PROPERTY SKIP_AUTOMOC TRUE) # don't run automoc on this file
set_property(SOURCE ${_src_FILE} APPEND PROPERTY OBJECT_DEPENDS ${_moc_FILE} )
endif()