diff --git a/CMakeLists.txt b/CMakeLists.txt index 96283de2..d3a3ec5c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,6 +37,7 @@ set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/runtime") +option(QUITE_INSTALL "If ON the libraries will be exported" ON) option(QUITE_BUILD_PROBE_QT "Decides if the probes should be build" ON) option(QUITE_BUILD_TEST_API "Decides if the testing API should be build" ON) cmake_dependent_option( @@ -139,7 +140,7 @@ endif() feature_summary(WHAT ENABLED_FEATURES DISABLED_FEATURES DESCRIPTION "Features:") feature_summary(WHAT PACKAGES_FOUND DESCRIPTION "Found packages:") -if(NOT CMAKE_SKIP_INSTALL_RULES) +if(QUITE_INSTALL) include(CMakePackageConfigHelpers) install( diff --git a/docs/building.md b/docs/building.md index de4fdfa5..7c5f47f2 100644 --- a/docs/building.md +++ b/docs/building.md @@ -71,3 +71,10 @@ See [Python Usage](python-usage.md) for details. - [Qt](https://www.qt.io/) ≥ `6.5.0` --- + +### `QUITE_INSTALL` + +- **Default:**: `ON` +- **Description:**: Adds cmake install steps to targets. + +--- diff --git a/libs/core/include/quite/value/object_query.hpp b/libs/core/include/quite/value/object_query.hpp index cfa3a744..ca848d7e 100644 --- a/libs/core/include/quite/value/object_query.hpp +++ b/libs/core/include/quite/value/object_query.hpp @@ -46,7 +46,7 @@ class QUITE_CORE_EXPORT ObjectQueryBuilder ObjectQueryBuilder &with_property(std::string key, std::string value); - ObjectQueryBuilder &with_parent(std::shared_ptr parent); + ObjectQueryBuilder &with_parent(ObjectQueryBuilder parent); ObjectQueryBuilder &with_type(std::string type_name); diff --git a/libs/core/src/value/object_query.cpp b/libs/core/src/value/object_query.cpp index 58d3089f..e6e41ba7 100644 --- a/libs/core/src/value/object_query.cpp +++ b/libs/core/src/value/object_query.cpp @@ -52,9 +52,9 @@ ObjectQueryBuilder &ObjectQueryBuilder::with_property(std::string key, std::stri return *this; } -ObjectQueryBuilder &ObjectQueryBuilder::with_parent(std::shared_ptr parent) +ObjectQueryBuilder &ObjectQueryBuilder::with_parent(ObjectQueryBuilder parent) { - query_->container = std::move(parent); + query_->container = parent; return *this; } diff --git a/pyproject.toml b/pyproject.toml index b7ea7c78..eb1ef449 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,7 +25,7 @@ QUITE_BUILD_PROBE_QT = "OFF" QUITE_BUILD_REMOTE_MANAGER = "OFF" BUILD_SHARED_LIBS = "OFF" BUILD_TESTING = "OFF" -CMAKE_SKIP_INSTALL_RULES = "ON" +QUITE_INSTALL = "OFF" [tool.pytest.ini_options]