diff options
| author | David Cole <david.cole@kitware.com> | 2012-09-25 19:18:43 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-09-25 19:18:43 (GMT) |
| commit | 2e489526faa82e7f1895a5fddc48f949b2365ec0 (patch) | |
| tree | 75ac88e99c5ae36291d8509ce5b7d6a08303bfcb /Modules | |
| parent | 3f3b731961c0ac1614fff67bdcd006428d2f08cb (diff) | |
| parent | e83cc94dcd250e90143450bc916353b449043081 (diff) | |
| download | CMake-2e489526faa82e7f1895a5fddc48f949b2365ec0.zip CMake-2e489526faa82e7f1895a5fddc48f949b2365ec0.tar.gz CMake-2e489526faa82e7f1895a5fddc48f949b2365ec0.tar.bz2 | |
Merge topic 'AutomocUseTargetProperties'
e83cc94 Use the cmGeneratorTarget for the include directories API.
9d8e59d Merge branch 'use-generator-target' into AutomocUseTargetProperties
ea12871 Automoc: also the makefile-COMPILE_DEFINITIONS
894e91a Automoc: do not use DEFINITIONS, but only COMPILE_DEFINITIONS
825d1ab Automoc: fix #13493, use target properties for include dirs
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/AutomocInfo.cmake.in | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Modules/AutomocInfo.cmake.in b/Modules/AutomocInfo.cmake.in index 13f2161..640bf70 100644 --- a/Modules/AutomocInfo.cmake.in +++ b/Modules/AutomocInfo.cmake.in @@ -1,7 +1,6 @@ set(AM_SOURCES @_moc_files@ ) 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@") |