diff --git a/CMakeLists.txt b/CMakeLists.txt index 362eb7e..4b6be91 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,7 +86,7 @@ set(QTK_OSX_ICONS ${CMAKE_SOURCE_DIR}/resources/icons/osx/kilroy.icns) # Print all QTK options and their values at the end of configuration. get_cmake_property(VAR_NAMES VARIABLES) -list(FILTER VAR_NAMES INCLUDE REGEX "^Q[tT][kK]_.*$") +list(FILTER VAR_NAMES INCLUDE REGEX "^[qQ][tT][kK]_.*$") list(SORT VAR_NAMES) ################################################################################ @@ -105,7 +105,7 @@ set( # Print all QTK options and their values. get_cmake_property(VAR_NAMES VARIABLES) -list(FILTER VAR_NAMES INCLUDE REGEX "^Q[tT][kK]_.*$") +list(FILTER VAR_NAMES INCLUDE REGEX "^[qQ][tT][kK]_.*$") list(SORT VAR_NAMES) ################################################################################ diff --git a/README.md b/README.md index 079218b..9ebf9a7 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ If the build is configured with all options enabled, we can subsequently install individual components as needed with cmake. ```bash -sudo apt update -y && sudo apt install libassimp-dev cmake build-essential git ccache libgl1-mesa-dev libglvnd-dev -y +sudo apt update -y && sudo apt install libassimp-dev cmake build-essential git ccache libgl1-mesa-dev libglvnd-dev zlib1g-dev -y git clone https://github.com/shaunrd0/qtk cd qtk # Configure the build with all components enabled diff --git a/example-app/examplescene.cpp b/example-app/examplescene.cpp index e812e79..02f9463 100644 --- a/example-app/examplescene.cpp +++ b/example-app/examplescene.cpp @@ -23,9 +23,9 @@ void ExampleScene::init() { auto skybox = new Qtk::Skybox("Skybox"); setSkybox(skybox); - auto spartan = new Model( - "spartan", std::string(QTK_EXAMPLE_SOURCE_DIR) - + "/../resources/models/spartan/spartan.obj"); + std::string spartanPath = QTK_EXAMPLE_SOURCE_DIR; + spartanPath += "/../resources/models/spartan/spartan.obj"; + auto spartan = new Model("spartan", spartanPath.c_str()); addObject(spartan); spartan->getTransform().setTranslation(-4.0f, 0.0f, 0.0f); diff --git a/src/app/qtkmainwindow.cpp b/src/app/qtkmainwindow.cpp index 888a366..34998db 100644 --- a/src/app/qtkmainwindow.cpp +++ b/src/app/qtkmainwindow.cpp @@ -83,6 +83,6 @@ Qtk::QtkWidget * MainWindow::getQtkWidget(const QString & name) { } void MainWindow::refreshScene(QString sceneName) { - // TODO: Select TreeView using sceneName> + // TODO: Select TreeView using sceneName ui_->qtk__TreeView->updateView(getQtkWidget()->getScene()); }