Skip to content

Commit 3897ba1

Browse files
authored
Merge pull request #53 from mathisloge/ml/fix_python_install
Fix external python usage
2 parents 15af1e5 + 407d2ff commit 3897ba1

File tree

5 files changed

+13
-5
lines changed

5 files changed

+13
-5
lines changed

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
3737
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
3838
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/runtime")
3939

40+
option(QUITE_INSTALL "If ON the libraries will be exported" ON)
4041
option(QUITE_BUILD_PROBE_QT "Decides if the probes should be build" ON)
4142
option(QUITE_BUILD_TEST_API "Decides if the testing API should be build" ON)
4243
cmake_dependent_option(
@@ -139,7 +140,7 @@ endif()
139140
feature_summary(WHAT ENABLED_FEATURES DISABLED_FEATURES DESCRIPTION "Features:")
140141
feature_summary(WHAT PACKAGES_FOUND DESCRIPTION "Found packages:")
141142

142-
if(NOT CMAKE_SKIP_INSTALL_RULES)
143+
if(QUITE_INSTALL)
143144
include(CMakePackageConfigHelpers)
144145

145146
install(

docs/building.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,10 @@ See [Python Usage](python-usage.md) for details.
7171
- [Qt](https://www.qt.io/)`6.5.0`
7272

7373
---
74+
75+
### `QUITE_INSTALL`
76+
77+
- **Default:**: `ON`
78+
- **Description:**: Adds cmake install steps to targets.
79+
80+
---

libs/core/include/quite/value/object_query.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class QUITE_CORE_EXPORT ObjectQueryBuilder
4646

4747
ObjectQueryBuilder &with_property(std::string key, std::string value);
4848

49-
ObjectQueryBuilder &with_parent(std::shared_ptr<ObjectQuery> parent);
49+
ObjectQueryBuilder &with_parent(ObjectQueryBuilder parent);
5050

5151
ObjectQueryBuilder &with_type(std::string type_name);
5252

libs/core/src/value/object_query.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ ObjectQueryBuilder &ObjectQueryBuilder::with_property(std::string key, std::stri
5252
return *this;
5353
}
5454

55-
ObjectQueryBuilder &ObjectQueryBuilder::with_parent(std::shared_ptr<ObjectQuery> parent)
55+
ObjectQueryBuilder &ObjectQueryBuilder::with_parent(ObjectQueryBuilder parent)
5656
{
57-
query_->container = std::move(parent);
57+
query_->container = parent;
5858
return *this;
5959
}
6060

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ QUITE_BUILD_PROBE_QT = "OFF"
2525
QUITE_BUILD_REMOTE_MANAGER = "OFF"
2626
BUILD_SHARED_LIBS = "OFF"
2727
BUILD_TESTING = "OFF"
28-
CMAKE_SKIP_INSTALL_RULES = "ON"
28+
QUITE_INSTALL = "OFF"
2929

3030

3131
[tool.pytest.ini_options]

0 commit comments

Comments
 (0)