diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-06-06 10:31:55 +0200 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-06-06 08:36:20 +0000 |
| commit | 89b7f7671924f810c34637ee1f91de33a720521a (patch) | |
| tree | 022c021f67c6da768ada72798ba328b93cf83a50 | |
| parent | 37cdd44982466546376375328712b9c05fa8a529 (diff) | |
Android: Move Platform Include
Move the include of the platform from QtPlatformSupport to QtSetup. This
no longer causes compile tests to fail since they expect explicit
include paths instead of using CMAKE_MODULE_PATH.
Change-Id: I9d3bed7845104d84422afb5a976ec14b111d259d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | cmake/QtPlatformSupport.cmake | 4 | ||||
| -rw-r--r-- | cmake/QtSetup.cmake | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/cmake/QtPlatformSupport.cmake b/cmake/QtPlatformSupport.cmake index 9a3befc420..ac9973905a 100644 --- a/cmake/QtPlatformSupport.cmake +++ b/cmake/QtPlatformSupport.cmake @@ -79,7 +79,3 @@ endfunction() if(CMAKE_CXX_COMPILER_VERSION) qt_parse_version_string("${CMAKE_CXX_COMPILER_VERSION}" "QT_COMPILER_VERSION") endif() - -if(ANDROID) - include(QtPlatformAndroid) -endif() diff --git a/cmake/QtSetup.cmake b/cmake/QtSetup.cmake index e7ec66b322..62d4b0dece 100644 --- a/cmake/QtSetup.cmake +++ b/cmake/QtSetup.cmake @@ -63,6 +63,11 @@ enable_testing() ## Define some constants to check for certain platforms, etc: include(QtPlatformSupport) +## Android platform settings +if(ANDROID) + include(QtPlatformAndroid) +endif() + ## add_qt_module and co.: include(QtBuild) |