-
Notifications
You must be signed in to change notification settings - Fork 1.7k
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.
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
qcoro 0.4.0 #8870
Merged
Merged
qcoro 0.4.0 #8870
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
5b72fb8
qcoro 0.4.0
ericLemanissier 616b9dc
build require cmake
ericLemanissier 39e7591
disable clang+libstdc++
ericLemanissier 9406ded
Update conanfile.py
ericLemanissier 52f3ef5
disable apple-clang 12
ericLemanissier a66583b
disable visual studio before 17
ericLemanissier File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
cmake_minimum_required(VERSION 3.1) | ||
project(cmake_wrapper) | ||
|
||
include("conanbuildinfo.cmake") | ||
conan_basic_setup(TARGETS) | ||
|
||
add_subdirectory(source_subfolder) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
sources: | ||
"0.4.0": | ||
url: "https://github.com/danvratil/qcoro/archive/refs/tags/v0.4.0.tar.gz" | ||
sha256: "0e68b3f0ce7bf521ffbdd731464d2d60d8d7a39a749b551ed26855a1707d86d1" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,147 @@ | ||
from conans import ConanFile, CMake, tools | ||
from conans.errors import ConanInvalidConfiguration | ||
import os | ||
|
||
required_conan_version = ">=1.33.0" | ||
|
||
|
||
class QCoroConan(ConanFile): | ||
name = "qcoro" | ||
license = "MIT" | ||
homepage = "https://github.com/danvratil/qcoro" | ||
url = "https://github.com/conan-io/conan-center-index" | ||
description = "C++ Coroutines for Qt." | ||
topics = ("coroutines", "qt") | ||
settings = "os", "compiler", "build_type", "arch" | ||
options = { | ||
"shared": [True, False], | ||
"fPIC": [True, False], | ||
"asan": [True, False], | ||
} | ||
default_options = { | ||
"shared": False, | ||
"fPIC": True, | ||
"asan": False, | ||
} | ||
generators = "cmake", "cmake_find_package_multi" | ||
exports_sources = ["CMakeLists.txt"] | ||
_cmake = None | ||
|
||
@property | ||
def _source_subfolder(self): | ||
return "source_subfolder" | ||
|
||
@property | ||
def _build_subfolder(self): | ||
return "build_subfolder" | ||
|
||
@property | ||
def _compilers_minimum_version(self): | ||
minimum_versions = { | ||
"gcc": "10", | ||
"Visual Studio": "17", | ||
"msvc": "19.29", | ||
"clang": "8", | ||
"apple-clang": "13" | ||
} | ||
return minimum_versions | ||
|
||
def config_options(self): | ||
if self.settings.os == "Windows": | ||
del self.options.fPIC | ||
|
||
def configure(self): | ||
if self.options.shared: | ||
del self.options.fPIC | ||
|
||
def build_requirements(self): | ||
self.build_requires("cmake/3.21.3") | ||
|
||
def requirements(self): | ||
self.requires("qt/6.2.2") | ||
self.requires("expat/2.4.2", override=True) | ||
|
||
def validate(self): | ||
if self.settings.compiler.cppstd: | ||
tools.check_min_cppstd(self, 20) | ||
|
||
def lazy_lt_semver(v1, v2): | ||
lv1 = [int(v) for v in v1.split(".")] | ||
lv2 = [int(v) for v in v2.split(".")] | ||
min_length = min(len(lv1), len(lv2)) | ||
return lv1[:min_length] < lv2[:min_length] | ||
|
||
#Special check for clang that can only be linked to libc++ | ||
if self.settings.compiler == "clang" and self.settings.compiler.libcxx != "libc++": | ||
raise ConanInvalidConfiguration("imagl requires some C++20 features, which are available in libc++ for clang compiler.") | ||
|
||
compiler_version = str(self.settings.compiler.version) | ||
|
||
minimum_version = self._compilers_minimum_version.get(str(self.settings.compiler), False) | ||
if not minimum_version: | ||
self.output.warn("qcoro requires C++20. Your compiler is unknown. Assuming it supports C++20.") | ||
elif lazy_lt_semver(compiler_version, minimum_version): | ||
raise ConanInvalidConfiguration("qcoro requires some C++20 features, which your {} {} compiler does not support.".format(str(self.settings.compiler), compiler_version)) | ||
else: | ||
print("Your compiler is {} {} and is compatible.".format(str(self.settings.compiler), compiler_version)) | ||
|
||
def source(self): | ||
tools.get(**self.conan_data["sources"][self.version], | ||
destination=self._source_subfolder, strip_root=True) | ||
|
||
def _configure_cmake(self): | ||
if self._cmake: | ||
return self._cmake | ||
|
||
self._cmake = CMake(self) | ||
|
||
self._cmake.definitions["QCORO_BUILD_EXAMPLES"] = False | ||
self._cmake.definitions["QCORO_ENABLE_ASAN"] = self.options.asan | ||
self._cmake.definitions["BUILD_TESTING"] = False | ||
self._cmake.definitions["QCORO_WITH_QTDBUS"] = self.options["qt"].with_dbus | ||
self._cmake.configure(build_folder=self._build_subfolder) | ||
return self._cmake | ||
|
||
def build(self): | ||
for patch in self.conan_data.get("patches", {}).get(self.version, []): | ||
tools.patch(**patch) | ||
cmake = self._configure_cmake() | ||
cmake.build() | ||
|
||
def package(self): | ||
self.copy("*", dst="licenses", src=os.path.join(self._source_subfolder, "LICENSES")) | ||
cmake = self._configure_cmake() | ||
cmake.install() | ||
|
||
for mask in ["Find*.cmake", "*Config*.cmake", "*-config.cmake", "*Targets*.cmake"]: | ||
tools.remove_files_by_mask(self.package_folder, mask) | ||
|
||
def package_info(self): | ||
self.cpp_info.filenames["cmake_find_package"] = "QCoro6" | ||
self.cpp_info.filenames["cmake_find_package_multi"] = "QCoro6" | ||
self.cpp_info.set_property("cmake_file_name", "QCoro6") | ||
self.cpp_info.names["cmake_find_package"] = "QCoro" | ||
self.cpp_info.names["cmake_find_package_multi"] = "QCoro" | ||
|
||
self.cpp_info.components["qcoro-core"].set_property("cmake_target_name", "QCoro::Core") | ||
self.cpp_info.components["qcoro-core"].names["cmake_find_package"] = "Core" | ||
self.cpp_info.components["qcoro-core"].names["cmake_find_package_multi"] = "Core" | ||
self.cpp_info.components["qcoro-core"].libs = ["QCoro6Core"] | ||
self.cpp_info.components["qcoro-core"].includedirs.append(os.path.join("include", "qcoro6", "qcoro")) | ||
self.cpp_info.components["qcoro-core"].requires = ["qt::qtCore"] | ||
self.cpp_info.components["qcoro-core"].build_modules["cmake_find_package"].append(os.path.join("lib", "cmake", "QCoro6Coro", "QCoroMacros.cmake")) | ||
self.cpp_info.components["qcoro-core"].build_modules["cmake_find_package_multi"].append(os.path.join("lib", "cmake", "QCoro6Coro", "QCoroMacros.cmake")) | ||
self.cpp_info.components["qcoro-core"].builddirs.append(os.path.join("lib", "cmake", "QCoro6Coro")) | ||
|
||
self.cpp_info.components["qcoro-network"].set_property("cmake_target_name", "QCoro::Network") | ||
self.cpp_info.components["qcoro-network"].names["cmake_find_package"] = "Network" | ||
self.cpp_info.components["qcoro-network"].names["cmake_find_package_multi"] = "Network" | ||
self.cpp_info.components["qcoro-network"].libs = ["QCoro6Network"] | ||
self.cpp_info.components["qcoro-network"].requires = ["qt::qtNetwork"] | ||
|
||
if self.options["qt"].with_dbus: | ||
self.cpp_info.components["qcoro-dbus"].set_property("cmake_target_name", "QCoro::DBus") | ||
self.cpp_info.components["qcoro-dbus"].names["cmake_find_package"] = "DBus" | ||
self.cpp_info.components["qcoro-dbus"].names["cmake_find_package_multi"] = "DBus" | ||
self.cpp_info.components["qcoro-dbus"].libs = ["QCoroDBus"] | ||
self.cpp_info.components["qcoro-core"].requires = ["qt::qtDBus"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
cmake_minimum_required(VERSION 3.1) | ||
project(test_package CXX) | ||
|
||
include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) | ||
conan_basic_setup(TARGETS) | ||
|
||
find_package(QCoro6 REQUIRED COMPONENTS Core) | ||
qcoro_enable_coroutines() | ||
|
||
add_executable(${PROJECT_NAME} test_package.cpp) | ||
target_link_libraries(${PROJECT_NAME} QCoro::Core | ||
Qt6::Core | ||
Qt6::Concurrent) | ||
set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD 20) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
from conans import ConanFile, CMake, tools | ||
import os | ||
|
||
|
||
class TestPackageConan(ConanFile): | ||
settings = "os", "arch", "compiler", "build_type" | ||
generators = "cmake", "cmake_find_package" | ||
|
||
def build_requirements(self): | ||
self.build_requires("cmake/3.21.3") | ||
|
||
def build(self): | ||
cmake = CMake(self) | ||
cmake.configure() | ||
cmake.build() | ||
|
||
def test(self): | ||
if not tools.cross_building(self): | ||
self.run(os.path.join("bin", "test_package"), run_environment=True) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
// SPDX-FileCopyrightText: 2021 Daniel Vrátil <dvratil@kde.org> | ||
// | ||
// SPDX-License-Identifier: MIT | ||
|
||
#include "qcorofuture.h" | ||
|
||
#include <QCoreApplication> | ||
#include <QTimer> | ||
#include <QtConcurrent> | ||
|
||
#include <iostream> | ||
#include <random> | ||
|
||
QCoro::Task<> startTask() { | ||
const auto data = co_await QtConcurrent::run([]() { | ||
QVector<std::uint64_t> data; | ||
std::random_device rd{}; | ||
std::mt19937 gen{rd()}; | ||
data.reserve(10'000'000); | ||
for (int i = 0; i < 10'000'000; ++i) { | ||
data.push_back(gen()); | ||
} | ||
return data; | ||
}); | ||
|
||
std::cout << "Generated " << data.size() << " random numbers" << std::endl; | ||
|
||
const auto sum = co_await QtConcurrent::filteredReduced<std::uint64_t>( | ||
data, [](const auto &) { return true; }, | ||
[](std::uint64_t &interm, std::uint64_t val) { interm += val; }, | ||
QtConcurrent::UnorderedReduce); | ||
|
||
std::cout << "Calculated result: " << sum << std::endl; | ||
qApp->quit(); | ||
} | ||
|
||
int main(int argc, char **argv) { | ||
QCoreApplication app(argc, argv); | ||
QTimer::singleShot(0, startTask); | ||
return app.exec(); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
versions: | ||
"0.4.0": | ||
folder: all |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why expat version is overridden?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't remember. probably a conflict in qt requirements ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would be nice to remove it in the next PR.