diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2023-04-13 14:10:16 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2023-04-13 14:36:26 +0200 |
| commit | 06499383ca1628c1ceeb4b2b786299093372de1d (patch) | |
| tree | 384388bca6be4955e9d316b89c771da9402d37b5 | |
| parent | d953bc76bb67b6e24936af5ab04887e937d5d5c3 (diff) | |
Use LANGUAGE OBJCXX rather than COMPILE_FLAGS "-x objective-c++"
We sometimes use Objective-C++ code in files with a .cpp extension,
to avoid the churn of adding a foo_mac.mm file. Instead of manually
telling the compiler to build these files in Objective-C++ mode, we
use CMake's intended mechanism, which means genex constructs such as
$<$<COMPILE_LANGUAGE:OBJCXX> will work for these files as well.
Pick-to: 6.5 6.2
Change-Id: If295c3f34f6bee9f4d9f877f519c9c7770665fee
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| -rw-r--r-- | src/widgets/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/corelib/io/qdebug/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/corelib/io/qfileinfo/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/gui/kernel/qwindow/CMakeLists.txt | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index 39c197eeba..aaa81286ab 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -693,7 +693,7 @@ if(QT_FEATURE_wizard) if(APPLE) set_source_files_properties(dialogs/qwizard.cpp PROPERTIES - COMPILE_FLAGS "-x objective-c++" + LANGUAGE OBJCXX SKIP_PRECOMPILE_HEADERS ON ) endif() diff --git a/tests/auto/corelib/io/qdebug/CMakeLists.txt b/tests/auto/corelib/io/qdebug/CMakeLists.txt index cef57a2186..c9fd9c6df8 100644 --- a/tests/auto/corelib/io/qdebug/CMakeLists.txt +++ b/tests/auto/corelib/io/qdebug/CMakeLists.txt @@ -13,5 +13,5 @@ qt_internal_add_test(tst_qdebug ) if (APPLE) - target_compile_options(tst_qdebug PRIVATE -x objective-c++) + set_source_files_properties(tst_qdebug.cpp PROPERTIES LANGUAGE OBJCXX) endif() diff --git a/tests/auto/corelib/io/qfileinfo/CMakeLists.txt b/tests/auto/corelib/io/qfileinfo/CMakeLists.txt index 5fdc764e8a..4da51ce219 100644 --- a/tests/auto/corelib/io/qfileinfo/CMakeLists.txt +++ b/tests/auto/corelib/io/qfileinfo/CMakeLists.txt @@ -48,5 +48,5 @@ qt_internal_extend_target(tst_qfileinfo CONDITION WIN32 ) if (APPLE) - target_compile_options(tst_qfileinfo PRIVATE -x objective-c++) + set_source_files_properties(tst_qfileinfo.cpp PROPERTIES LANGUAGE OBJCXX) endif() diff --git a/tests/auto/gui/kernel/qwindow/CMakeLists.txt b/tests/auto/gui/kernel/qwindow/CMakeLists.txt index 605761622f..5ddda80c2a 100644 --- a/tests/auto/gui/kernel/qwindow/CMakeLists.txt +++ b/tests/auto/gui/kernel/qwindow/CMakeLists.txt @@ -25,7 +25,7 @@ if(APPLE OR WIN32) ) if(APPLE) - target_compile_options(tst_foreignwindow PRIVATE -x objective-c++) + set_source_files_properties(tst_foreignwindow.cpp PROPERTIES LANGUAGE OBJCXX) set_property(TARGET tst_foreignwindow PROPERTY PROPERTY MACOSX_BUNDLE TRUE) endif() endif() |