diff options
| author | David Cole <david.cole@kitware.com> | 2011-12-07 21:29:13 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2011-12-07 21:29:13 (GMT) |
| commit | 2d1195123ec85ffd04b415914cc5127db918d2c9 (patch) | |
| tree | 7a05a915e9599c1596aa220ad620c965abe3902b /Modules/AutomocInfo.cmake.in | |
| parent | 1eca18fd522575126b4d1e4faa3c9437d2f12e22 (diff) | |
| parent | 9f18f64c7cfe57df96b6c2cd19d383f9532b6827 (diff) | |
| download | CMake-2d1195123ec85ffd04b415914cc5127db918d2c9.zip CMake-2d1195123ec85ffd04b415914cc5127db918d2c9.tar.gz CMake-2d1195123ec85ffd04b415914cc5127db918d2c9.tar.bz2 | |
Merge branch 'master' into AutomocIncludedDotMocFileHandling
Conflicts:
Source/cmTarget.cxx
Diffstat (limited to 'Modules/AutomocInfo.cmake.in')
| -rw-r--r-- | Modules/AutomocInfo.cmake.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/AutomocInfo.cmake.in b/Modules/AutomocInfo.cmake.in index 293ba64..44f2da2 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@/") @@ -10,5 +11,6 @@ set(AM_QT_MOC_EXECUTABLE "@QT_MOC_EXECUTABLE@") set(AM_CMAKE_CURRENT_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@/") set(AM_CMAKE_CURRENT_BINARY_DIR "@CMAKE_CURRENT_BINARY_DIR@/") set(AM_QT_VERSION_MAJOR "@QT_VERSION_MAJOR@" ) +set(AM_Qt5Core_VERSION_MAJOR "@Qt5Core_VERSION_MAJOR@" ) set(AM_TARGET_NAME "@_moc_target_name@") set(AM_STRICT_MODE "@_moc_strict_mode@") |