mirror of
https://git.yoctoproject.org/poky
synced 2026-02-25 10:59:41 +01:00
7add0b8b4d
Add a patch that avoids hardcoded sphinx dependency. Switch off a couple of new features (zchunk, html docs for hawkey library via sphinx) that both require new dependencies. Move from modulemd 1.x to 2.x, drop upstreamed patches. (From OE-Core rev: ce54462de6642935859421f2116e25ca5b2faa8c) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
50 lines
1.6 KiB
Diff
50 lines
1.6 KiB
Diff
From 56fa2bbdbd29377a6ef0d0b7aadbac8b5ea8c95b Mon Sep 17 00:00:00 2001
|
|
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
|
Date: Tue, 6 Nov 2018 13:54:43 +0100
|
|
Subject: [PATCH] Add WITH_TESTS option
|
|
|
|
This makes a dependency on cppunit optional.
|
|
|
|
Upstream-Status: Pending
|
|
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
|
|
|
---
|
|
CMakeLists.txt | 3 +++
|
|
python/hawkey/CMakeLists.txt | 2 ++
|
|
2 files changed, 5 insertions(+)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 881152a..965c992 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -33,6 +33,7 @@ option(WITH_MAN "Enables hawkey man page generation" ON)
|
|
option(WITH_ZCHUNK "Build with zchunk support" ON)
|
|
option(ENABLE_RHSM_SUPPORT "Build with Red Hat Subscription Manager support?" OFF)
|
|
option(ENABLE_SOLV_URPMREORDER "Build with support for URPM-like solution reordering?" OFF)
|
|
+option(WITH_TESTS "Enables unit tests" ON)
|
|
|
|
|
|
# load pkg-config first; it's required by other modules
|
|
@@ -165,8 +166,10 @@ endif()
|
|
|
|
|
|
# build tests
|
|
+IF (WITH_TESTS)
|
|
enable_testing()
|
|
add_subdirectory(tests)
|
|
+ENDIF()
|
|
if(WITH_BINDINGS)
|
|
add_subdirectory(python/hawkey)
|
|
endif()
|
|
diff --git a/python/hawkey/CMakeLists.txt b/python/hawkey/CMakeLists.txt
|
|
index d964534..84d1720 100644
|
|
--- a/python/hawkey/CMakeLists.txt
|
|
+++ b/python/hawkey/CMakeLists.txt
|
|
@@ -50,4 +50,6 @@ target_link_libraries(_hawkeymodule ${PYTHON_LIBRARY})
|
|
install(FILES __init__.py DESTINATION ${PYTHON_INSTALL_DIR}/hawkey)
|
|
install(TARGETS _hawkeymodule LIBRARY DESTINATION ${PYTHON_INSTALL_DIR}/hawkey)
|
|
|
|
+IF (WITH_TESTS)
|
|
add_subdirectory(tests)
|
|
+ENDIF()
|