diff options
| author | David Cole <david.cole@kitware.com> | 2011-12-01 19:02:21 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-12-01 19:02:21 (GMT) |
| commit | 9c288d6c2b0c762b36974755e459d421d186f7e0 (patch) | |
| tree | 5cbc2ea5e5c565bf57f51bfbeb13981efa477dac /Modules | |
| parent | 3f4672b1d70c84bfcb9f362f00a452d12c07c4e4 (diff) | |
| parent | a8286235a31437505a53f5874e8bf98524b6dca3 (diff) | |
| download | CMake-9c288d6c2b0c762b36974755e459d421d186f7e0.zip CMake-9c288d6c2b0c762b36974755e459d421d186f7e0.tar.gz CMake-9c288d6c2b0c762b36974755e459d421d186f7e0.tar.bz2 | |
Merge topic 'automoc_qt5'
a828623 moc is now part of the Qt5Core module
b8c8cab Merge remote-tracking branch 'origin/master' into automoc_qt5
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/AutomocInfo.cmake.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/AutomocInfo.cmake.in b/Modules/AutomocInfo.cmake.in index 8542ff6..2c7c724 100644 --- a/Modules/AutomocInfo.cmake.in +++ b/Modules/AutomocInfo.cmake.in @@ -11,5 +11,5 @@ 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_Qt5SrcTools_VERSION_MAJOR "@Qt5SrcTools_VERSION_MAJOR@" ) +set(AM_Qt5Core_VERSION_MAJOR "@Qt5Core_VERSION_MAJOR@" ) set(AM_TARGET_NAME "@_moc_target_name@") |