diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-05-27 15:58:57 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-05-27 23:19:37 (GMT) |
| commit | fa55751f83dc5d5bd5f80d12c3076ec703262edb (patch) | |
| tree | 7420d760cbeaad79622325d3b285a1b53d2c743f /Modules | |
| parent | f77631672168b1e3b5fad93c2bb83db65cb67e7b (diff) | |
| download | CMake-fa55751f83dc5d5bd5f80d12c3076ec703262edb.zip CMake-fa55751f83dc5d5bd5f80d12c3076ec703262edb.tar.gz CMake-fa55751f83dc5d5bd5f80d12c3076ec703262edb.tar.bz2 | |
QtAutomoc: Get the Qt version through the target link interface
In Qt 5.1, Qt5::Core has a INTERFACE_QT_MAJOR_VERSION property
of '5', and since CMake 2.8.11, Qt4::QtCore has an
INTERFACE_QT_MAJOR_VERSION of '4'. This was introduced in
commit 4aa10cd6 (FindQt4: Set the INTERFACE_QT_MAJOR_VERSION for
Qt4::QtCore, 2013-03-16), to produce an error if Qt 4 and Qt 5
are erroneously used by the same target. This can also be used
however to determine the Qt major version, and therefore the
particular moc executable to use during automoc steps. This means
that targets in a single buildsystem can use a selection of Qt 4
and Qt 5, and still take advantage of the CMAKE_AUTOMOC feature
without conflicting.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/AutomocInfo.cmake.in | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Modules/AutomocInfo.cmake.in b/Modules/AutomocInfo.cmake.in index e5bee86..9cff735 100644 --- a/Modules/AutomocInfo.cmake.in +++ b/Modules/AutomocInfo.cmake.in @@ -9,7 +9,6 @@ set(AM_CMAKE_SOURCE_DIR "@CMAKE_SOURCE_DIR@/") 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_QT_VERSION_MAJOR "@_target_qt_version@") set(AM_TARGET_NAME @_moc_target_name@) set(AM_RELAXED_MODE "@_moc_relaxed_mode@") |