From ee2735cd6a5fe07a33ae7327f350c6725b15cc2d Mon Sep 17 00:00:00 2001 From: heinezen Date: Sat, 7 Oct 2023 22:01:07 +0200 Subject: [PATCH 1/2] assets: Add missing directories to CMakeLists. --- assets/test/CMakeLists.txt | 2 ++ assets/test/nyan/CMakeLists.txt | 4 ++++ assets/test/qml/CMakeLists.txt | 4 ++++ 3 files changed, 10 insertions(+) create mode 100644 assets/test/nyan/CMakeLists.txt create mode 100644 assets/test/qml/CMakeLists.txt diff --git a/assets/test/CMakeLists.txt b/assets/test/CMakeLists.txt index 3b758cc51c..4e7576778d 100644 --- a/assets/test/CMakeLists.txt +++ b/assets/test/CMakeLists.txt @@ -1,4 +1,6 @@ # Copyright 2023-2023 the openage authors. See copying.md for legal info. +add_subdirectory(nyan/) +add_subdirectory(qml/) add_subdirectory(shaders/) add_subdirectory(textures/) diff --git a/assets/test/nyan/CMakeLists.txt b/assets/test/nyan/CMakeLists.txt new file mode 100644 index 0000000000..cb92b3c3e7 --- /dev/null +++ b/assets/test/nyan/CMakeLists.txt @@ -0,0 +1,4 @@ +install(DIRECTORY "." + DESTINATION "${ASSET_DIR}/test/nyan" + FILES_MATCHING PATTERN "*.nyan" +) diff --git a/assets/test/qml/CMakeLists.txt b/assets/test/qml/CMakeLists.txt new file mode 100644 index 0000000000..950e6b402e --- /dev/null +++ b/assets/test/qml/CMakeLists.txt @@ -0,0 +1,4 @@ +install(DIRECTORY "." + DESTINATION "${ASSET_DIR}/test/qml" + FILES_MATCHING PATTERN "*.qml" +) From f54d8028fd512e771c3c1441d4ab650530a76603 Mon Sep 17 00:00:00 2001 From: heinezen Date: Sat, 7 Oct 2023 23:15:39 +0200 Subject: [PATCH 2/2] presenter: Additional log messages for QML init. --- libopenage/presenter/presenter.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libopenage/presenter/presenter.cpp b/libopenage/presenter/presenter.cpp index ab0f3b1f25..925d2d650d 100644 --- a/libopenage/presenter/presenter.cpp +++ b/libopenage/presenter/presenter.cpp @@ -158,16 +158,19 @@ void Presenter::init_gui() { //// -- gui initialization // TODO: Do not use test GUI util::Path qml_root = this->root_dir / "assets" / "test" / "qml"; + log::log(INFO << "Presenter: Setting QML root to " << qml_root.resolve_native_path()); if (not qml_root.is_dir()) { throw Error{ERR << "could not find qml root folder " << qml_root}; } util::Path qml_assets = this->root_dir / "assets"; + log::log(INFO << "Presenter: Setting QML asset path to " << qml_assets.resolve_native_path()); if (not qml_assets.is_dir()) { throw Error{ERR << "could not find asset root folder " << qml_assets}; } util::Path qml_root_file = qml_root / "main.qml"; + log::log(INFO << "Presenter: Setting QML root file to " << qml_root_file.resolve_native_path()); if (not qml_root_file.is_file()) { throw Error{ERR << "could not find main.qml file " << qml_root_file}; }