summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2011-11-08 19:42:51 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2011-11-08 19:42:51 (GMT)
commit3452dadf89db0bc6cfc6e80d2caf0b6c7891d120 (patch)
treeb2138c63218c75ae9917c7f511a3b14c007249ab /Modules
parent6c2f30822bc4eec4bd3e47d0f06fbf9627a21d45 (diff)
parent2c648ab7e204540a8a669b597cc7d3510c84647e (diff)
downloadCMake-3452dadf89db0bc6cfc6e80d2caf0b6c7891d120.zip
CMake-3452dadf89db0bc6cfc6e80d2caf0b6c7891d120.tar.gz
CMake-3452dadf89db0bc6cfc6e80d2caf0b6c7891d120.tar.bz2
Merge topic 'AddMocOptionsToAutomoc'
2c648ab add documentation for the AUTOMOC_MOC_OPTIONS property 52719a1 automoc: fix #12541, support moc options
Diffstat (limited to 'Modules')
-rw-r--r--Modules/AutomocInfo.cmake.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/Modules/AutomocInfo.cmake.in b/Modules/AutomocInfo.cmake.in
index 2dc3aa2..9c71952 100644
--- a/Modules/AutomocInfo.cmake.in
+++ b/Modules/AutomocInfo.cmake.in
@@ -3,6 +3,7 @@ set(AM_HEADERS "@_moc_headers@" )
set(AM_MOC_COMPILE_DEFINITIONS "@_moc_compile_defs@")
set(AM_MOC_DEFINITIONS "@_moc_defs@")
set(AM_MOC_INCLUDES "@_moc_incs@")
+set(AM_MOC_OPTIONS "@_moc_options@")
set(AM_CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE "@CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE@")
set(AM_CMAKE_BINARY_DIR "@CMAKE_BINARY_DIR@/")
set(AM_CMAKE_SOURCE_DIR "@CMAKE_SOURCE_DIR@/")