diff options
| author | Cristian Adam <cristian.adam@qt.io> | 2020-11-05 14:29:44 +0100 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2020-11-05 20:49:43 +0000 |
| commit | 970102639fa43c8dcbba7514e62154d006b7109f (patch) | |
| tree | 662a0fb164649c95e7878cef4e45e475ef8a2cee /examples | |
| parent | 252947a8054eaa5cff181171592a6fd4a9beaef6 (diff) | |
CMake Build: Fix QtWayland examples linker errors
The examples have enabled only the CXX language, while the wayland
code generation CMake helper function would generate a C file, which
would not get compiled correctly.
By removing LANGUAGES CXX, the examples will have the default CMake
languages enabled: C and CXX.
Fixes: QTBUG-88040
Change-Id: Ia79563b60b5bc140ad0f9e087198044b2eb67d9e
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'examples')
5 files changed, 5 insertions, 5 deletions
diff --git a/examples/wayland/custom-extension/compositor/CMakeLists.txt b/examples/wayland/custom-extension/compositor/CMakeLists.txt index de5eafd96..5bea51e73 100644 --- a/examples/wayland/custom-extension/compositor/CMakeLists.txt +++ b/examples/wayland/custom-extension/compositor/CMakeLists.txt @@ -1,7 +1,7 @@ # Generated from compositor.pro. cmake_minimum_required(VERSION 3.14) -project(custom-extension-compositor LANGUAGES CXX) +project(custom-extension-compositor) # special case set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/examples/wayland/custom-extension/cpp-client/CMakeLists.txt b/examples/wayland/custom-extension/cpp-client/CMakeLists.txt index 3cb61a54d..ce1203517 100644 --- a/examples/wayland/custom-extension/cpp-client/CMakeLists.txt +++ b/examples/wayland/custom-extension/cpp-client/CMakeLists.txt @@ -1,7 +1,7 @@ # Generated from cpp-client.pro. cmake_minimum_required(VERSION 3.14) -project(custom-extension-cpp-client LANGUAGES CXX) +project(custom-extension-cpp-client) # special case set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/examples/wayland/custom-extension/qml-client/CMakeLists.txt b/examples/wayland/custom-extension/qml-client/CMakeLists.txt index 7b68ecbc1..956d1f4d7 100644 --- a/examples/wayland/custom-extension/qml-client/CMakeLists.txt +++ b/examples/wayland/custom-extension/qml-client/CMakeLists.txt @@ -1,7 +1,7 @@ # Generated from qml-client.pro. cmake_minimum_required(VERSION 3.14) -project(custom-extension-qml-client LANGUAGES CXX) +project(custom-extension-qml-client) # special case set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/examples/wayland/server-buffer/compositor/CMakeLists.txt b/examples/wayland/server-buffer/compositor/CMakeLists.txt index 513e73bb0..aefdc74fb 100644 --- a/examples/wayland/server-buffer/compositor/CMakeLists.txt +++ b/examples/wayland/server-buffer/compositor/CMakeLists.txt @@ -1,7 +1,7 @@ # Generated from compositor.pro. cmake_minimum_required(VERSION 3.14) -project(compositor LANGUAGES CXX) +project(compositor) # special case set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/examples/wayland/server-buffer/cpp-client/CMakeLists.txt b/examples/wayland/server-buffer/cpp-client/CMakeLists.txt index 438bd3a5e..763cfc0d4 100644 --- a/examples/wayland/server-buffer/cpp-client/CMakeLists.txt +++ b/examples/wayland/server-buffer/cpp-client/CMakeLists.txt @@ -1,7 +1,7 @@ # Generated from cpp-client.pro. cmake_minimum_required(VERSION 3.14) -project(server-buffer-cpp-client LANGUAGES CXX) +project(server-buffer-cpp-client) # special case set(CMAKE_INCLUDE_CURRENT_DIR ON) |