From 14054d45212efe83e470ef6af43eda6f85f6a128 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sat, 16 Mar 2013 18:43:52 +0100 Subject: Set the INTERFACE_QT_MAJOR_VERSION to 5. This way, CMake will issue an error if there is an attempt to use Qt 4 and Qt 5 in the same target. Change-Id: I0cad31b00f7eb7dc372491e0f5734765551c3d6e Reviewed-by: Brad King Reviewed-by: Stephen Kelly --- src/corelib/Qt5CoreConfigExtras.cmake.in | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/corelib/Qt5CoreConfigExtras.cmake.in') diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in index 4e0fcda20e..29e37be64a 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in @@ -41,6 +41,11 @@ set(Qt5Core_QMAKE_EXECUTABLE Qt5::qmake) set(Qt5Core_MOC_EXECUTABLE Qt5::moc) set(Qt5Core_RCC_EXECUTABLE Qt5::rcc) +set_property(TARGET Qt5::Core PROPERTY INTERFACE_QT_MAJOR_VERSION 5) +set_property(TARGET Qt5::Core APPEND PROPERTY + COMPATIBLE_INTERFACE_STRING QT_MAJOR_VERSION +) + !!IF isEmpty(CMAKE_ARCHDATA_DIR_IS_ABSOLUTE) list(APPEND Qt5Core_INCLUDE_DIRS \"${_qt5Core_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5Core_install_prefix}/$${CMAKE_ARCHDATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") !!ELSE -- cgit v1.2.3