summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-04-06 15:52:48 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-04-07 13:04:06 +0200
commit23be07c2d026ef92e7a826c6dbde23fd9d651321 (patch)
treed124cf25da6ea6ef5089a79c47d60d16c57c13dd /cmake
parentc356380154f170bed7c5947d58c9b3c92eee0121 (diff)
CMake: Autodetect Objective-C support only on macOS
On Android, check_language() reports that the languages are supported, but enable_language fails afterwards. On Linux it causes issues with the PCH. The PCH file might contain a Clang pragma, even though the C++ compiler is GCC. Presumably due to finding a Clang Objective-C compiler. Change-Id: I1b4c54459772c089e7f6350872c87af52ad72a37 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/QtBuildInternals/QtBuildInternalsConfig.cmake7
1 files changed, 6 insertions, 1 deletions
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
index 3265fea7b2..5648326ca2 100644
--- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
+++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
@@ -68,7 +68,12 @@ endmacro()
macro(qt_enable_cmake_languages)
include(CheckLanguage)
set(__qt_required_language_list C CXX)
- set(__qt_optional_language_list OBJC OBJCXX)
+ set(__qt_optional_language_list )
+
+ # https://gitlab.kitware.com/cmake/cmake/-/issues/20545
+ if(APPLE)
+ list(APPEND __qt_optional_language_list OBJC OBJCXX)
+ endif()
foreach(__qt_lang ${__qt_required_language_list})
enable_language(${__qt_lang})