Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add missing asset directories to CMakeLists #1565

Merged
merged 2 commits into from
Oct 8, 2023
Merged

Add missing asset directories to CMakeLists #1565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee2735c
assets: Add missing directories to CMakeLists.
heinezen Oct 7, 2023
f54d802
presenter: Additional log messages for QML init.
heinezen Oct 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions assets/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/)
4 changes: 4 additions & 0 deletions assets/test/nyan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
install(DIRECTORY "."
DESTINATION "${ASSET_DIR}/test/nyan"
FILES_MATCHING PATTERN "*.nyan"
)
4 changes: 4 additions & 0 deletions assets/test/qml/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
install(DIRECTORY "."
DESTINATION "${ASSET_DIR}/test/qml"
FILES_MATCHING PATTERN "*.qml"
)
3 changes: 3 additions & 0 deletions libopenage/presenter/presenter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};
}
Expand Down