diff options
| author | Stephen Kelly <steveire@gmail.com> | 2012-04-10 00:39:36 +0200 |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2012-04-10 00:39:36 +0200 |
| commit | 5dd458d1e753a98721d6ca7a7b1465e26ef60db4 (patch) | |
| tree | 6a1aca01ace7a32cebdcb61d0ccd873efdc78417 | |
| parent | 6e908ad49809c21494e817ec8dc5d564a2a65b44 (diff) | |
| download | extra-cmake-modules-5dd458d1e753a98721d6ca7a7b1465e26ef60db4.tar.gz extra-cmake-modules-5dd458d1e753a98721d6ca7a7b1465e26ef60db4.tar.bz2 | |
Make it easier to build for Qt5.
No longer need to set an option.
| -rw-r--r-- | modules/FindQt5Transitional.cmake | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/modules/FindQt5Transitional.cmake b/modules/FindQt5Transitional.cmake index 732bcf81..b913db2b 100644 --- a/modules/FindQt5Transitional.cmake +++ b/modules/FindQt5Transitional.cmake @@ -1,7 +1,7 @@ -option(QT5_BUILD "Build with Qt5") +find_package(Qt5Core QUIET) -if (QT5_BUILD) +if (Qt5Core_FOUND) if (NOT Qt5Transitional_FIND_COMPONENTS) foreach(_component Core @@ -46,9 +46,8 @@ if (QT5_BUILD) endforeach() endif() - if(Qt5Core_FOUND) - set(Qt5Transitional_FOUND TRUE) - endif() + set(Qt5Transitional_FOUND TRUE) + set(QT5_BUILD TRUE) include("${CMAKE_CURRENT_LIST_DIR}/ECMQt4To5Porting.cmake") # TODO: Port away from this. include_directories(${QT_INCLUDES}) # TODO: Port away from this. else() |