Skip to content

Commit

Permalink
Say hello to AuroraGlobalPrivate
Browse files Browse the repository at this point in the history
This is a module that contains configure information and it's shared by
the other Aurora modules.

Closes: #45
  • Loading branch information
plfiorini committed Oct 13, 2023
1 parent eb00c8b commit 372f1d3
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 24 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ if(NOT LIRI_SUPERBUILD)
endif()

## Add subdirectories:
add_subdirectory(src/global)
if(FEATURE_aurora_xkbcommon)
add_subdirectory(src/platformsupport/xkbcommon)
endif()
Expand Down
10 changes: 3 additions & 7 deletions src/compositor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ liri_add_module(AuroraCompositor
extensions/aurorawlqtkey.cpp extensions/aurorawlqtkey_p.h
extensions/aurorawlqttouch.cpp extensions/aurorawlqttouch_p.h
global/aurorawaylandcompositorextension.cpp global/aurorawaylandcompositorextension.h global/aurorawaylandcompositorextension_p.h
global/liriauroracompositorfeatures.h.in
global/aurorawaylandutils_p.h
global/aurorawaylandqmlinclude.h
wayland_wrapper/aurorawlbuffermanager.cpp wayland_wrapper/aurorawlbuffermanager_p.h
Expand All @@ -90,18 +89,15 @@ liri_add_module(AuroraCompositor
Wayland::Server
LIBRARIES
Qt::GuiPrivate
Liri::AuroraGlobalPrivate
PKGCONFIG_DEPENDENCIES
Qt${QT_DEFAULT_MAJOR_VERSION}Core
Qt${QT_DEFAULT_MAJOR_VERSION}Gui
wayland-server
)

configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/global/liriauroracompositorfeatures.h.in"
"${CMAKE_CURRENT_BINARY_DIR}/liriauroracompositorfeatures.h"
@ONLY
)
set(_global_header_features "#include <LiriAuroraCompositor/liriauroracompositorfeatures.h>
set(_global_header_features "#include <LiriAuroraGlobalPrivate/aurorafeatures.h>
#include <QtGui/qtgui-config.h>
#include <QtGui/qtguiglobal.h>")
liri_extend_target(AuroraCompositor
SOURCES
Expand Down
23 changes: 23 additions & 0 deletions src/global/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
liri_add_module(AuroraGlobalPrivate
DESCRIPTION
"Contains configure features shared by Aurora modules"
SOURCES
aurorafeatures.h.in
STATIC
NO_PKGCONFIG
)

configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/aurorafeatures.h.in"
"${CMAKE_CURRENT_BINARY_DIR}/aurorafeatures.h"
@ONLY
)
set(_global_header_features "#include <LiriAuroraGlobalPrivate/aurorafeatures.h>")
liri_extend_target(AuroraGlobalPrivate
SOURCES
"${CMAKE_CURRENT_BINARY_DIR}/aurorafeatures.h"
GLOBAL_HEADER_CONTENT
"${_global_header_features}"
)

liri_finalize_module(AuroraGlobalPrivate)
9 changes: 0 additions & 9 deletions src/global/README

This file was deleted.

2 changes: 2 additions & 0 deletions src/global/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
The AuroraGlobalPrivate module is a module that contains configure
features, shared by the modules of Aurora.
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
// SPDX-FileCopyrightText: 2021 Pier Luigi Fiorini <[email protected]>
//
// SPDX-License-Identifier: GPL-3.0-or-later
// SPDX-FileCopyrightText: 2023 Pier Luigi Fiorini <[email protected]>
// SPDX-License-Identifier: LGPL-3.0-or-later

#ifndef LIRIAURORACOMPOSITORFEATURES_H
#define LIRIAURORACOMPOSITORFEATURES_H
#ifndef AURORAFEATURES_H
#define AURORAFEATURES_H

#cmakedefine01 LIRI_FEATURE_aurora_datadevice
#cmakedefine01 LIRI_FEATURE_aurora_xkbcommon
Expand All @@ -18,6 +17,4 @@
#cmakedefine01 LIRI_FEATURE_aurora_shm_emulation_server
#cmakedefine01 LIRI_FEATURE_aurora_xwayland

#include <QtGui/qtgui-config.h>

#endif // LIRIAURORACOMPOSITORFEATURES_H
#endif // AURORAFEATURES_H

0 comments on commit 372f1d3

Please sign in to comment.