diff --git a/README.md b/README.md index cc6ba7e..c383a9f 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,6 @@ Building -------- ```shell - $ cd recipes/abseil - $ conan create . abseil/20200225.2@signbit/testing $ cd ../protoc_installer $ conan create . protobuf_compiler/3.11.4@signbit/testing $ cd ../grpc_plugin @@ -34,17 +32,6 @@ Testing ------- ```shell - $ cd tests - # abseil - $ mkdir abseil.build - $ cd abseil.build - $ conan install ../abseil - $ cmake ../abseil - $ cmake --build . - $ ./test1 - dewey - huey - louie # grpc $ cd ../ $ mkdir greeter_example.build @@ -66,7 +53,6 @@ License These scripts have been heavily influenced by the original upstream sources: - * licensed under Apache-2.0 * licensed under MIT * licensed under MIT diff --git a/recipes/abseil/CMakeLists.txt b/recipes/abseil/CMakeLists.txt deleted file mode 100644 index f6b0aac..0000000 --- a/recipes/abseil/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -cmake_minimum_required(VERSION 3.13) -project(cmake_wrapper) - -include(conanbuildinfo.cmake) -conan_basic_setup(TARGETS) - -add_subdirectory("source_subfolder") diff --git a/recipes/abseil/conandata.yml b/recipes/abseil/conandata.yml deleted file mode 100644 index 07f2a9e..0000000 --- a/recipes/abseil/conandata.yml +++ /dev/null @@ -1,4 +0,0 @@ -sources: - "20200225.2": - url: "https://github.com/abseil/abseil-cpp/archive/20200225.2.tar.gz" - sha256: "f41868f7a938605c92936230081175d1eae87f6ea2c248f41077c8f88316f111" diff --git a/recipes/abseil/conanfile.py b/recipes/abseil/conanfile.py deleted file mode 100644 index 3022175..0000000 --- a/recipes/abseil/conanfile.py +++ /dev/null @@ -1,123 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- - -# Note: Conan is supported on a best-effort basis. Abseil doesn't use Conan -# internally, so we won't know if it stops working. We may ask community -# members to help us debug any problems that arise. - -import os - -from conans import ConanFile, CMake, tools -from conans.errors import ConanInvalidConfiguration -from conans.model.version import Version - - -class AbseilConan(ConanFile): - name = "abseil" - version = "20200225.2" - description = "Abseil Common Libraries (C++) from Google" - homepage = "https://github.com/abseil/abseil-cpp" - url = "https://github.com/0x8000-0000/conan-recipes/" - license = "Apache-2.0" - author = "Florin Iucha " - topics = ("conan", "abseil", "abseil-cpp", "google", "common-libraries") - settings = "os", "compiler", "build_type", "arch" - exports = ["LICENSE"] - exports_sources = ["CMakeLists.txt", "CMake/*", "absl/*"] - options = {"shared": [True, False], "fPIC": [True, False]} - default_options = {"shared": False, "fPIC": True} - generators = "cmake" - - @property - def _source_subfolder(self): - return "source_subfolder" - - @property - def _build_subfolder(self): - return "build_subfolder" - - def configure(self): - if ( - self.settings.os == "Windows" - and self.settings.compiler == "Visual Studio" - and Version(self.settings.compiler.version.value) < "14" - ): - raise ConanInvalidConfiguration("Abseil does not support MSVC < 14") - - def source(self): - tools.get(**self.conan_data["sources"][self.version]) - extracted_dir = self.name + "-cpp-" + self.version - os.rename(extracted_dir, self._source_subfolder) - - def build(self): - cmake = CMake(self) - cmake.definitions["BUILD_TESTING"] = False - cmake.configure(build_folder=self._build_subfolder) - cmake.build() - - def package(self): - self.copy("LICENSE", dst="licenses", src=self._source_subfolder) - self.copy("*.h", dst="include", src=self._source_subfolder, keep_path=True) - self.copy("*.inc", dst="include", src=self._source_subfolder, keep_path=True) - self.copy("*.a", dst="lib", src=".", keep_path=False) - self.copy("*.lib", dst="lib", src=".", keep_path=False) - - def package_info(self): - self.cpp_info.libs = [ - "absl_flags_parse", - "absl_flags_usage", - "absl_flags_usage_internal", - "absl_flags", - "absl_flags_internal", - "absl_flags_registry", - "absl_flags_config", - "absl_flags_program_name", - "absl_flags_marshalling", - "absl_raw_hash_set", - "absl_random_seed_sequences", - "absl_hashtablez_sampler", - "absl_synchronization", - "absl_time", - "absl_civil_time", - "absl_time_zone", - "absl_failure_signal_handler", - "absl_random_internal_distribution_test_util", - "absl_examine_stack", - "absl_symbolize", - "absl_str_format_internal", - "absl_graphcycles_internal", - "absl_stacktrace", - "absl_malloc_internal", - "absl_demangle_internal", - "absl_debugging_internal", - "absl_periodic_sampler", - "absl_exponential_biased", - "absl_random_internal_pool_urbg", - "absl_random_distributions", - "absl_random_internal_seed_material", - "absl_random_seed_gen_exception", - "absl_hash", - "absl_strings", - "absl_strings_internal", - "absl_bad_variant_access", - "absl_throw_delegate", - "absl_city", - "absl_base", - "absl_dynamic_annotations", - "absl_bad_any_cast_impl", - "absl_scoped_set_env", - "absl_bad_optional_access", - "absl_raw_logging_internal", - "absl_log_severity", - "absl_spinlock_wait", - "absl_random_internal_randen", - "absl_random_internal_randen_hwaes", - "absl_random_internal_randen_slow", - "absl_random_internal_randen_hwaes_impl", - "absl_leak_check", - "absl_leak_check_disable", - "absl_int128", - ] - if self.settings.os == "Linux": - self.cpp_info.system_libs.append("pthread") - self.cpp_info.names["cmake"] = "absl" diff --git a/recipes/grpc/conanfile.py b/recipes/grpc/conanfile.py index 74c30b1..2898728 100644 --- a/recipes/grpc/conanfile.py +++ b/recipes/grpc/conanfile.py @@ -26,13 +26,13 @@ def _build_subfolder(self): return "build_subfolder" def requirements(self): - self.requires.add("zlib/1.2.11") - self.requires.add("gflags/2.2.2") - self.requires.add("openssl/1.1.1e") - self.requires.add("libuv/1.34.2") - self.requires.add("c-ares/1.15.0") - self.requires.add("protobuf/3.11.4") - self.requires.add("abseil/20200225.2@signbit/testing") + self.requires("zlib/1.2.11") + self.requires("gflags/2.2.2") + self.requires("openssl/1.1.1e") + self.requires("libuv/1.34.2") + self.requires("c-ares/1.15.0") + self.requires("protobuf/3.11.4") + self.requires("abseil/20200225.2") def build_requirements(self): self.build_requires("protobuf_compiler/3.11.4@signbit/testing") diff --git a/recipes/grpc_plugin/conanfile.py b/recipes/grpc_plugin/conanfile.py index 93d396c..9a9645b 100644 --- a/recipes/grpc_plugin/conanfile.py +++ b/recipes/grpc_plugin/conanfile.py @@ -24,13 +24,13 @@ def _build_subfolder(self): return "build_subfolder" def requirements(self): - self.requires.add("zlib/1.2.11") - self.requires.add("gflags/2.2.2") - self.requires.add("openssl/1.1.1e") - self.requires.add("libuv/1.34.2") - self.requires.add("c-ares/1.15.0") - self.requires.add("protobuf/3.11.4") - self.requires.add("abseil/20200225.2@signbit/testing") + self.requires("zlib/1.2.11") + self.requires("gflags/2.2.2") + self.requires("openssl/1.1.1e") + self.requires("libuv/1.34.2") + self.requires("c-ares/1.15.0") + self.requires("protobuf/3.11.4") + self.requires("abseil/20200225.2") def build_requirements(self): self.build_requires("protobuf_compiler/3.11.4@signbit/testing") diff --git a/tests/abseil/CMakeLists.txt b/tests/abseil/CMakeLists.txt deleted file mode 100644 index ce5a551..0000000 --- a/tests/abseil/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -cmake_minimum_required(VERSION 3.15.1) -project(test_abseil - VERSION 0.1 - DESCRIPTION "Test Abseil Packaging" - LANGUAGES CXX) - -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup(TARGETS NO_OUTPUT_DIRS) - -add_executable(test1 test1.cpp) -target_compile_features(test1 PUBLIC cxx_std_17) -set_target_properties(test1 PROPERTIES CXX_EXTENSIONS OFF) -target_link_libraries(test1 PUBLIC CONAN_PKG::absl) diff --git a/tests/abseil/conanfile.txt b/tests/abseil/conanfile.txt deleted file mode 100644 index 79a7686..0000000 --- a/tests/abseil/conanfile.txt +++ /dev/null @@ -1,6 +0,0 @@ -[requires] -abseil/20200225.2@signbit/testing -grpc/1.28.1@signbit/testing - -[generators] -cmake diff --git a/tests/abseil/test1.cpp b/tests/abseil/test1.cpp deleted file mode 100644 index 0d26ffd..0000000 --- a/tests/abseil/test1.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include - -#include -#include - -int main() -{ - absl::flat_hash_set set2 = {{"huey"}, {"dewey"}, {"louie"},}; - - for (auto& str: set2) - { - std::cout << str << "\n"; - } - - return 0; -}