diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-12-11 16:14:22 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-12-11 15:46:08 +0000 |
| commit | ed6e6c37875d80db8b25e217959d91c71179e932 (patch) | |
| tree | 9807b2a63ec4cf66131f665ff0144c174a93b324 | |
| parent | 6d73b02ace298daabbb8f692fcbbbe3728c8b25a (diff) | |
Expose Patch Version in QtConfig.cmake
Change-Id: I2166d480c0b717fc9137f8eb42d5aab7a091395d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | cmake/QtBuild.cmake | 6 | ||||
| -rw-r--r-- | cmake/QtConfig.cmake.in | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 8b87ef9fdb..a70f974678 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -904,8 +904,10 @@ function(qt_autogen_tools_initial_setup target) set_property(TARGET "${target}" APPEND PROPERTY COMPATIBLE_INTERFACE_STRING QT_MAJOR_VERSION) set_directory_properties(PROPERTIES - QT_VERSION_MAJOR ${PROJECT_VERSION_MAJOR} - QT_VERSION_MINOR ${PROJECT_VERSION_MINOR}) + QT_VERSION_MAJOR ${PROJECT_VERSION_MAJOR} + QT_VERSION_MINOR ${PROJECT_VERSION_MINOR} + QT_VERSION_PATCH ${PROJECT_VERSION_PATCH} + ) qt_enable_autogen_tool(${target} "moc" ON) endfunction() diff --git a/cmake/QtConfig.cmake.in b/cmake/QtConfig.cmake.in index 6bb323f22f..6d69c1f90e 100644 --- a/cmake/QtConfig.cmake.in +++ b/cmake/QtConfig.cmake.in @@ -18,7 +18,8 @@ else() # Make CMake's AUTOGEN detect this Qt version properly set_directory_properties(PROPERTIES QT_VERSION_MAJOR @PROJECT_VERSION_MAJOR@ - QT_VERSION_MINOR @PROJECT_VERSION_MINOR@) + QT_VERSION_MINOR @PROJECT_VERSION_MINOR@ + QT_VERSION_PATCH @PROJECT_VERSION_PATCH@) endif() # if (NOT @INSTALL_CMAKE_NAMESPACE@_FIND_COMPONENTS) |