diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-03 09:57:52 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-04 23:21:32 +0200 |
| commit | 2073a1649782348ac870c1f0babdcc3f17ed41e8 (patch) | |
| tree | e8a4ca45c9d89f82b76c6acd448c3e8fd4d261c9 /cmake | |
| parent | dc26b30acd5fc04a9388c4fc529cd059b97f0dc4 (diff) | |
CMake: Clean up AND NOT QT_BUILD_STANDALONE_TESTS in QtAutoDetect
Now that the whole file is not included when doing standalone tests,
the conditions are not needed anymore.
Change-Id: I49ddd2fc4a8327e09529948785f40cda5dedbb11
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtAutoDetect.cmake | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cmake/QtAutoDetect.cmake b/cmake/QtAutoDetect.cmake index 5c72bf39d8..65bbf1baeb 100644 --- a/cmake/QtAutoDetect.cmake +++ b/cmake/QtAutoDetect.cmake @@ -6,8 +6,7 @@ # done when initially configuring qtbase. function(qt_auto_detect_android) - if(DEFINED CMAKE_TOOLCHAIN_FILE AND NOT DEFINED QT_AUTODETECT_ANDROID - AND NOT QT_BUILD_STANDALONE_TESTS) + if(DEFINED CMAKE_TOOLCHAIN_FILE AND NOT DEFINED QT_AUTODETECT_ANDROID) file(READ ${CMAKE_TOOLCHAIN_FILE} toolchain_file_content OFFSET 0 LIMIT 80) string(FIND ${toolchain_file_content} "The Android Open Source Project" find_result REVERSE) @@ -34,7 +33,7 @@ function(qt_auto_detect_android) endfunction() function(qt_auto_detect_vpckg) - if(DEFINED ENV{VCPKG_ROOT} AND NOT QT_BUILD_STANDALONE_TESTS) + if(DEFINED ENV{VCPKG_ROOT}) set(vcpkg_toolchain_file "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake") get_filename_component(vcpkg_toolchain_file "${vcpkg_toolchain_file}" ABSOLUTE) |