summaryrefslogtreecommitdiff
path: root/adw
diff options
context:
space:
mode:
Diffstat (limited to 'adw')
-rw-r--r--adw/CMakeLists.txt36
-rw-r--r--adw/include/adwaitamm/actionrow.hpp (renamed from adw/include/turns/adw/actionrow.hpp)6
-rw-r--r--adw/include/adwaitamm/application.hpp (renamed from adw/include/turns/adw/application.hpp)6
-rw-r--r--adw/include/adwaitamm/applicationwindow.hpp (renamed from adw/include/turns/adw/applicationwindow.hpp)4
-rw-r--r--adw/include/adwaitamm/breakpoint.hpp (renamed from adw/include/turns/adw/breakpoint.hpp)6
-rw-r--r--adw/include/adwaitamm/dialog.hpp (renamed from adw/include/turns/adw/dialog.hpp)6
-rw-r--r--adw/include/adwaitamm/helpers/gobj_mixin.hpp (renamed from adw/include/turns/adw/helpers/gobj_mixin.hpp)4
-rw-r--r--adw/include/adwaitamm/helpers/properties.hpp (renamed from adw/include/turns/adw/helpers/properties.hpp)4
-rw-r--r--adw/include/adwaitamm/preferencesdialog.hpp (renamed from adw/include/turns/adw/preferencesdialog.hpp)6
-rw-r--r--adw/include/adwaitamm/preferencespage.hpp (renamed from adw/include/turns/adw/preferencespage.hpp)4
-rw-r--r--adw/include/adwaitamm/preferencesrow.hpp (renamed from adw/include/turns/adw/preferencesrow.hpp)6
-rw-r--r--adw/include/adwaitamm/switchrow.hpp (renamed from adw/include/turns/adw/switchrow.hpp)8
-rw-r--r--adw/include/adwaitamm/toast.hpp (renamed from adw/include/turns/adw/toast.hpp)6
-rw-r--r--adw/include/adwaitamm/toastoverlay.hpp (renamed from adw/include/turns/adw/toastoverlay.hpp)8
-rw-r--r--adw/include/adwaitamm/wrap_init.hpp (renamed from adw/include/turns/adw/wrap_init.hpp)4
-rw-r--r--adw/src/actionrow.cpp6
-rw-r--r--adw/src/application.cpp4
-rw-r--r--adw/src/applicationwindow.cpp2
-rw-r--r--adw/src/breakpoint.cpp4
-rw-r--r--adw/src/dialog.cpp4
-rw-r--r--adw/src/preferencesdialog.cpp6
-rw-r--r--adw/src/preferencespage.cpp2
-rw-r--r--adw/src/preferencesrow.cpp2
-rw-r--r--adw/src/switchrow.cpp4
-rw-r--r--adw/src/toast.cpp4
-rw-r--r--adw/src/toastoverlay.cpp4
-rw-r--r--adw/src/wrap_init.cpp24
27 files changed, 102 insertions, 78 deletions
diff --git a/adw/CMakeLists.txt b/adw/CMakeLists.txt
index 28b3ae1..1d939af 100644
--- a/adw/CMakeLists.txt
+++ b/adw/CMakeLists.txt
@@ -1,4 +1,18 @@
-add_library("adw"
+cmake_minimum_required(VERSION "3.30.0")
+
+project("adwaitamm"
+ LANGUAGES CXX
+ VERSION "1.7.0"
+ DESCRIPTION "C++ wrapper for libadwaita"
+)
+
+find_package("PkgConfig" REQUIRED)
+
+pkg_check_modules("adwaita" IMPORTED_TARGET REQUIRED "libadwaita-1>=1.7.0")
+pkg_check_modules("giomm" IMPORTED_TARGET REQUIRED "giomm-2.68>=2.80")
+pkg_check_modules("glibmm" IMPORTED_TARGET REQUIRED "glibmm-2.68>=2.80")
+
+add_library("adwaitamm"
"src/actionrow.cpp"
"src/application.cpp"
"src/applicationwindow.cpp"
@@ -13,20 +27,30 @@ add_library("adw"
"src/wrap_init.cpp"
)
-add_library("turns::adw" ALIAS "adw")
+target_include_directories("adwaitamm" SYSTEM PUBLIC
+ "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
+ "$<INSTALL_INTERFACE:include>"
+)
-target_include_directories("adw" PUBLIC
- "include"
+target_compile_features("adwaitamm" PUBLIC
+ "cxx_std_20"
)
-target_compile_options("adw" PUBLIC
+target_compile_options("adwaitamm" PRIVATE
"$<$<CXX_COMPILER_ID:GNU,Clang>:-Wall>"
"$<$<CXX_COMPILER_ID:GNU,Clang>:-Wextra>"
"$<$<CXX_COMPILER_ID:GNU,Clang>:-Werror>"
"$<$<CXX_COMPILER_ID:GNU,Clang>:-pedantic-errors>"
)
-target_link_libraries("adw" PUBLIC
+target_link_libraries("adwaitamm" PUBLIC
"PkgConfig::adwaita"
"PkgConfig::gtkmm"
)
+
+set_target_properties("adwaitamm" PROPERTIES
+ CXX_EXTENSIONS NO
+ CXX_STANDARD_REQUIRED YES
+)
+
+add_library("adwaitamm::adwaitamm" ALIAS "adwaitamm") \ No newline at end of file
diff --git a/adw/include/turns/adw/actionrow.hpp b/adw/include/adwaitamm/actionrow.hpp
index 5005f66..1859048 100644
--- a/adw/include/turns/adw/actionrow.hpp
+++ b/adw/include/adwaitamm/actionrow.hpp
@@ -1,8 +1,8 @@
-#ifndef TURNS_ADW_ACTION_ROW_HPP
-#define TURNS_ADW_ACTION_ROW_HPP
+#ifndef LIBADWAITAMM_ACTION_ROW_HPP
+#define LIBADWAITAMM_ACTION_ROW_HPP
#include "helpers/gobj_mixin.hpp"
-#include "turns/adw/preferencesrow.hpp"
+#include "adwaitamm/preferencesrow.hpp"
#include <glibmm/class.h>
#include <glibmm/object.h>
diff --git a/adw/include/turns/adw/application.hpp b/adw/include/adwaitamm/application.hpp
index df5e930..c482b8a 100644
--- a/adw/include/turns/adw/application.hpp
+++ b/adw/include/adwaitamm/application.hpp
@@ -1,7 +1,7 @@
-#ifndef TURNS_ADW_APPLICATION_HPP
-#define TURNS_ADW_APPLICATION_HPP
+#ifndef LIBADWAITAMM_APPLICATION_HPP
+#define LIBADWAITAMM_APPLICATION_HPP
-#include "turns/adw/helpers/gobj_mixin.hpp"
+#include "adwaitamm/helpers/gobj_mixin.hpp"
#include <glibmm/class.h>
#include <glibmm/refptr.h>
diff --git a/adw/include/turns/adw/applicationwindow.hpp b/adw/include/adwaitamm/applicationwindow.hpp
index e5b02b0..a8175df 100644
--- a/adw/include/turns/adw/applicationwindow.hpp
+++ b/adw/include/adwaitamm/applicationwindow.hpp
@@ -1,5 +1,5 @@
-#ifndef TURNS_ADW_APPLICATION_WINDOW_HPP
-#define TURNS_ADW_APPLICATION_WINDOW_HPP
+#ifndef LIBADWAITAMM_APPLICATION_WINDOW_HPP
+#define LIBADWAITAMM_APPLICATION_WINDOW_HPP
#include "helpers/gobj_mixin.hpp"
diff --git a/adw/include/turns/adw/breakpoint.hpp b/adw/include/adwaitamm/breakpoint.hpp
index e5dabe3..8a78abb 100644
--- a/adw/include/turns/adw/breakpoint.hpp
+++ b/adw/include/adwaitamm/breakpoint.hpp
@@ -1,7 +1,7 @@
-#ifndef TURNS_ADW_BREAKPOINT_HPP
-#define TURNS_ADW_BREAKPOINT_HPP
+#ifndef LIBADWAITAMM_BREAKPOINT_HPP
+#define LIBADWAITAMM_BREAKPOINT_HPP
-#include "turns/adw/helpers/gobj_mixin.hpp"
+#include "adwaitamm/helpers/gobj_mixin.hpp"
#include <glibmm/object.h>
#include <glibmm/objectbase.h>
diff --git a/adw/include/turns/adw/dialog.hpp b/adw/include/adwaitamm/dialog.hpp
index 3536dfa..5be01b9 100644
--- a/adw/include/turns/adw/dialog.hpp
+++ b/adw/include/adwaitamm/dialog.hpp
@@ -1,8 +1,8 @@
-#ifndef TURNS_ADW_DIALOG_HPP
-#define TURNS_ADW_DIALOG_HPP
+#ifndef LIBADWAITAMM_DIALOG_HPP
+#define LIBADWAITAMM_DIALOG_HPP
#include "helpers/gobj_mixin.hpp"
-#include "turns/adw/breakpoint.hpp"
+#include "adwaitamm/breakpoint.hpp"
#include <glibmm/class.h>
#include <glibmm/object.h>
diff --git a/adw/include/turns/adw/helpers/gobj_mixin.hpp b/adw/include/adwaitamm/helpers/gobj_mixin.hpp
index 67600cf..2a6aa37 100644
--- a/adw/include/turns/adw/helpers/gobj_mixin.hpp
+++ b/adw/include/adwaitamm/helpers/gobj_mixin.hpp
@@ -1,5 +1,5 @@
-#ifndef TURNS_ADW_HELPERS_GOBJ_MIXIN_HPP
-#define TURNS_ADW_HELPERS_GOBJ_MIXIN_HPP
+#ifndef LIBADWAITAMM_HELPERS_GOBJ_MIXIN_HPP
+#define LIBADWAITAMM_HELPERS_GOBJ_MIXIN_HPP
#include <glibmm/object.h>
diff --git a/adw/include/turns/adw/helpers/properties.hpp b/adw/include/adwaitamm/helpers/properties.hpp
index 6cc602a..6a7f7aa 100644
--- a/adw/include/turns/adw/helpers/properties.hpp
+++ b/adw/include/adwaitamm/helpers/properties.hpp
@@ -1,5 +1,5 @@
-#ifndef TURNS_ADW_HELPERS_PROPERTIES_HPP
-#define TURNS_ADW_HELPERS_PROPERTIES_HPP
+#ifndef LIBADWAITAMM_HELPERS_PROPERTIES_HPP
+#define LIBADWAITAMM_HELPERS_PROPERTIES_HPP
#include <glibmm/propertyproxy.h>
#include <glibmm/ustring.h>
diff --git a/adw/include/turns/adw/preferencesdialog.hpp b/adw/include/adwaitamm/preferencesdialog.hpp
index 324ab1d..d57e015 100644
--- a/adw/include/turns/adw/preferencesdialog.hpp
+++ b/adw/include/adwaitamm/preferencesdialog.hpp
@@ -1,9 +1,9 @@
-#ifndef TURNS_ADW_PREFERENCES_DIALOG_HPP
-#define TURNS_ADW_PREFERENCES_DIALOG_HPP
+#ifndef LIBADWAITAMM_PREFERENCES_DIALOG_HPP
+#define LIBADWAITAMM_PREFERENCES_DIALOG_HPP
#include "dialog.hpp"
#include "helpers/gobj_mixin.hpp"
-#include "turns/adw/preferencespage.hpp"
+#include "adwaitamm/preferencespage.hpp"
#include <glibmm/class.h>
#include <glibmm/object.h>
diff --git a/adw/include/turns/adw/preferencespage.hpp b/adw/include/adwaitamm/preferencespage.hpp
index dceabf8..d6c4ca4 100644
--- a/adw/include/turns/adw/preferencespage.hpp
+++ b/adw/include/adwaitamm/preferencespage.hpp
@@ -1,5 +1,5 @@
-#ifndef TURNS_ADW_PREFERENCES_PAGE_HPP
-#define TURNS_ADW_PREFERENCES_PAGE_HPP
+#ifndef LIBADWAITAMM_PREFERENCES_PAGE_HPP
+#define LIBADWAITAMM_PREFERENCES_PAGE_HPP
#include "helpers/gobj_mixin.hpp"
diff --git a/adw/include/turns/adw/preferencesrow.hpp b/adw/include/adwaitamm/preferencesrow.hpp
index 7490d05..f98e125 100644
--- a/adw/include/turns/adw/preferencesrow.hpp
+++ b/adw/include/adwaitamm/preferencesrow.hpp
@@ -1,8 +1,8 @@
-#ifndef TURNS_ADW_PREFERENCES_ROW_HPP
-#define TURNS_ADW_PREFERENCES_ROW_HPP
+#ifndef LIBADWAITAMM_PREFERENCES_ROW_HPP
+#define LIBADWAITAMM_PREFERENCES_ROW_HPP
#include "helpers/gobj_mixin.hpp"
-#include "turns/adw/helpers/properties.hpp"
+#include "adwaitamm/helpers/properties.hpp"
#include <glibmm/class.h>
#include <glibmm/object.h>
diff --git a/adw/include/turns/adw/switchrow.hpp b/adw/include/adwaitamm/switchrow.hpp
index 39c21da..c13d534 100644
--- a/adw/include/turns/adw/switchrow.hpp
+++ b/adw/include/adwaitamm/switchrow.hpp
@@ -1,9 +1,9 @@
-#ifndef TURNS_ADW_SWITCH_ROW_HPP
-#define TURNS_ADW_SWITCH_ROW_HPP
+#ifndef LIBADWAITAMM_SWITCH_ROW_HPP
+#define LIBADWAITAMM_SWITCH_ROW_HPP
#include "helpers/gobj_mixin.hpp"
-#include "turns/adw/actionrow.hpp"
-#include "turns/adw/helpers/properties.hpp"
+#include "adwaitamm/actionrow.hpp"
+#include "adwaitamm/helpers/properties.hpp"
#include <glibmm/class.h>
#include <glibmm/object.h>
diff --git a/adw/include/turns/adw/toast.hpp b/adw/include/adwaitamm/toast.hpp
index da0ef4d..88460f9 100644
--- a/adw/include/turns/adw/toast.hpp
+++ b/adw/include/adwaitamm/toast.hpp
@@ -1,7 +1,7 @@
-#ifndef TURNS_ADW_TOAST_HPP
-#define TURNS_ADW_TOAST_HPP
+#ifndef LIBADWAITAMM_TOAST_HPP
+#define LIBADWAITAMM_TOAST_HPP
-#include "turns/adw/helpers/gobj_mixin.hpp"
+#include "adwaitamm/helpers/gobj_mixin.hpp"
#include <sigc++/signal.h>
#include <glibmm/object.h>
diff --git a/adw/include/turns/adw/toastoverlay.hpp b/adw/include/adwaitamm/toastoverlay.hpp
index 7560c0d..0ae8bcb 100644
--- a/adw/include/turns/adw/toastoverlay.hpp
+++ b/adw/include/adwaitamm/toastoverlay.hpp
@@ -1,8 +1,8 @@
-#ifndef TURNS_ADW_TOASTOVERLAY_HPP
-#define TURNS_ADW_TOASTOVERLAY_HPP
+#ifndef LIBADWAITAMM_TOASTOVERLAY_HPP
+#define LIBADWAITAMM_TOASTOVERLAY_HPP
-#include "turns/adw/helpers/gobj_mixin.hpp"
-#include "turns/adw/helpers/properties.hpp"
+#include "adwaitamm/helpers/gobj_mixin.hpp"
+#include "adwaitamm/helpers/properties.hpp"
#include <glibmm/class.h>
#include <glibmm/object.h>
diff --git a/adw/include/turns/adw/wrap_init.hpp b/adw/include/adwaitamm/wrap_init.hpp
index 5096736..0e22a9b 100644
--- a/adw/include/turns/adw/wrap_init.hpp
+++ b/adw/include/adwaitamm/wrap_init.hpp
@@ -1,5 +1,5 @@
-#ifndef TURNS_ADW_WRAP_INIT_HPP
-#define TURNS_ADW_WRAP_INIT_HPP
+#ifndef LIBADWAITAMM_WRAP_INIT_HPP
+#define LIBADWAITAMM_WRAP_INIT_HPP
namespace turns::adw
{
diff --git a/adw/src/actionrow.cpp b/adw/src/actionrow.cpp
index 9f79cee..48cee23 100644
--- a/adw/src/actionrow.cpp
+++ b/adw/src/actionrow.cpp
@@ -1,7 +1,7 @@
-#include "turns/adw/actionrow.hpp"
+#include "adwaitamm/actionrow.hpp"
-#include "turns/adw/helpers/properties.hpp"
-#include "turns/adw/preferencesrow.hpp"
+#include "adwaitamm/helpers/properties.hpp"
+#include "adwaitamm/preferencesrow.hpp"
#include <glibmm/class.h>
#include <glibmm/object.h>
diff --git a/adw/src/application.cpp b/adw/src/application.cpp
index 05bc07a..b8f5af9 100644
--- a/adw/src/application.cpp
+++ b/adw/src/application.cpp
@@ -1,6 +1,6 @@
-#include "turns/adw/application.hpp"
+#include "adwaitamm/application.hpp"
-#include "turns/adw/wrap_init.hpp"
+#include "adwaitamm/wrap_init.hpp"
#include <glibmm/class.h>
#include <glibmm/object.h>
diff --git a/adw/src/applicationwindow.cpp b/adw/src/applicationwindow.cpp
index af21a5e..4e1aff1 100644
--- a/adw/src/applicationwindow.cpp
+++ b/adw/src/applicationwindow.cpp
@@ -1,4 +1,4 @@
-#include "turns/adw/applicationwindow.hpp"
+#include "adwaitamm/applicationwindow.hpp"
#include <glibmm/class.h>
#include <glibmm/object.h>
diff --git a/adw/src/breakpoint.cpp b/adw/src/breakpoint.cpp
index ed1c7f0..4a9c4d5 100644
--- a/adw/src/breakpoint.cpp
+++ b/adw/src/breakpoint.cpp
@@ -1,6 +1,6 @@
-#include "turns/adw/breakpoint.hpp"
+#include "adwaitamm/breakpoint.hpp"
-#include "turns/adw/helpers/properties.hpp"
+#include "adwaitamm/helpers/properties.hpp"
#include <glibmm/class.h>
#include <glibmm/object.h>
diff --git a/adw/src/dialog.cpp b/adw/src/dialog.cpp
index 868ad22..f9fe48f 100644
--- a/adw/src/dialog.cpp
+++ b/adw/src/dialog.cpp
@@ -1,6 +1,6 @@
-#include "turns/adw/dialog.hpp"
+#include "adwaitamm/dialog.hpp"
-#include "turns/adw/breakpoint.hpp"
+#include "adwaitamm/breakpoint.hpp"
#include <glibmm/class.h>
#include <glibmm/object.h>
diff --git a/adw/src/preferencesdialog.cpp b/adw/src/preferencesdialog.cpp
index b949003..701b253 100644
--- a/adw/src/preferencesdialog.cpp
+++ b/adw/src/preferencesdialog.cpp
@@ -1,7 +1,7 @@
-#include "turns/adw/preferencesdialog.hpp"
+#include "adwaitamm/preferencesdialog.hpp"
-#include "turns/adw/dialog.hpp"
-#include "turns/adw/preferencespage.hpp"
+#include "adwaitamm/dialog.hpp"
+#include "adwaitamm/preferencespage.hpp"
#include <glibmm/class.h>
#include <glibmm/object.h>
diff --git a/adw/src/preferencespage.cpp b/adw/src/preferencespage.cpp
index 64ae62c..22ab639 100644
--- a/adw/src/preferencespage.cpp
+++ b/adw/src/preferencespage.cpp
@@ -1,4 +1,4 @@
-#include "turns/adw/preferencespage.hpp"
+#include "adwaitamm/preferencespage.hpp"
#include <glibmm/class.h>
#include <glibmm/object.h>
diff --git a/adw/src/preferencesrow.cpp b/adw/src/preferencesrow.cpp
index a6f5368..7bc330a 100644
--- a/adw/src/preferencesrow.cpp
+++ b/adw/src/preferencesrow.cpp
@@ -1,4 +1,4 @@
-#include "turns/adw/preferencesrow.hpp"
+#include "adwaitamm/preferencesrow.hpp"
#include <glibmm/class.h>
#include <glibmm/object.h>
diff --git a/adw/src/switchrow.cpp b/adw/src/switchrow.cpp
index d7dd9dd..6596748 100644
--- a/adw/src/switchrow.cpp
+++ b/adw/src/switchrow.cpp
@@ -1,6 +1,6 @@
-#include "turns/adw/switchrow.hpp"
+#include "adwaitamm/switchrow.hpp"
-#include "turns/adw/actionrow.hpp"
+#include "adwaitamm/actionrow.hpp"
#include <glibmm/class.h>
#include <glibmm/object.h>
diff --git a/adw/src/toast.cpp b/adw/src/toast.cpp
index 2e39cec..31b089e 100644
--- a/adw/src/toast.cpp
+++ b/adw/src/toast.cpp
@@ -1,6 +1,6 @@
-#include "turns/adw/toast.hpp"
+#include "adwaitamm/toast.hpp"
-#include "turns/adw/helpers/properties.hpp"
+#include "adwaitamm/helpers/properties.hpp"
#include <glibmm/class.h>
#include <glibmm/object.h>
diff --git a/adw/src/toastoverlay.cpp b/adw/src/toastoverlay.cpp
index c50c62d..4d7e9db 100644
--- a/adw/src/toastoverlay.cpp
+++ b/adw/src/toastoverlay.cpp
@@ -1,6 +1,6 @@
-#include "turns/adw/toastoverlay.hpp"
+#include "adwaitamm/toastoverlay.hpp"
-#include "turns/adw/toast.hpp"
+#include "adwaitamm/toast.hpp"
#include <glibmm/class.h>
#include <glibmm/object.h>
diff --git a/adw/src/wrap_init.cpp b/adw/src/wrap_init.cpp
index df553da..e58bffd 100644
--- a/adw/src/wrap_init.cpp
+++ b/adw/src/wrap_init.cpp
@@ -1,16 +1,16 @@
-#include "turns/adw/wrap_init.hpp"
+#include "adwaitamm/wrap_init.hpp"
-#include "turns/adw/actionrow.hpp"
-#include "turns/adw/application.hpp"
-#include "turns/adw/applicationwindow.hpp"
-#include "turns/adw/breakpoint.hpp"
-#include "turns/adw/dialog.hpp"
-#include "turns/adw/preferencesdialog.hpp"
-#include "turns/adw/preferencespage.hpp"
-#include "turns/adw/preferencesrow.hpp"
-#include "turns/adw/switchrow.hpp"
-#include "turns/adw/toast.hpp"
-#include "turns/adw/toastoverlay.hpp"
+#include "adwaitamm/actionrow.hpp"
+#include "adwaitamm/application.hpp"
+#include "adwaitamm/applicationwindow.hpp"
+#include "adwaitamm/breakpoint.hpp"
+#include "adwaitamm/dialog.hpp"
+#include "adwaitamm/preferencesdialog.hpp"
+#include "adwaitamm/preferencespage.hpp"
+#include "adwaitamm/preferencesrow.hpp"
+#include "adwaitamm/switchrow.hpp"
+#include "adwaitamm/toast.hpp"
+#include "adwaitamm/toastoverlay.hpp"
#include <glibmm/wrap.h>