maint: Update to conan CMakeToolchain for building

Author: tux3

CMakeLists.txt

@@ -1,8 +1,6 @@
-cmake_minimum_required(VERSION 3.4)
+cmake_minimum_required(VERSION 3.10)
 
 project(tconcurrent)
-include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-conan_basic_setup(TARGETS)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_EXTENSIONS OFF)
@@ -36,6 +34,9 @@ if(${WITH_COVERAGE})
   endif()
 endif()
 
+find_package(Boost CONFIG REQUIRED)
+find_package(enum-flags CONFIG REQUIRED)
+find_package(function2 CONFIG REQUIRED)
 
 set(tconcurrent_SRC
   include/tconcurrent/async.hpp
@@ -69,9 +70,9 @@ set(tconcurrent_SRC
 )
 
 set(tconcurrent_LIBS
-  CONAN_PKG::boost
-  CONAN_PKG::enum-flags
-  CONAN_PKG::function2
+  Boost
+  enum-flags::enum-flags
+  function2::function2
 )
 
 if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")

conanfile.py

@@ -1,4 +1,6 @@
-from conans import tools, CMake, ConanFile
+from conans import tools, ConanFile
+from conan.tools.cmake import CMake, CMakeToolchain, CMakeDeps
+from conan.tools.env import VirtualBuildEnv
 
 
 class TconcurrentConan(ConanFile):
@@ -20,7 +22,7 @@ class TconcurrentConan(ConanFile):
         "with_sanitizer_support=False",
     )
     exports_sources = "CMakeLists.txt", "src/*", "include/*", "test/*"
-    generators = "cmake"
+    generators = "CMakeDeps", "VirtualBuildEnv"
 
     @property
     def should_build_tests(self):
@@ -36,7 +38,7 @@ def requirements(self):
 
     def build_requirements(self):
         if self.should_build_tests:
-            self.build_requires("doctest/2.4.6-r1")
+            self.test_requires("doctest/2.4.6-r1")
 
     def configure(self):
         if self.options.with_coroutines_ts and self.settings.compiler != "clang":
@@ -48,17 +50,28 @@ def imports(self):
         self.copy("*.dylib", dst="bin", src="lib")
         self.copy("*.so*", dst="bin", src="lib")
 
+    def generate(self):
+        vbe = VirtualBuildEnv(self)
+        vbe.generate()
+
+        ct = CMakeToolchain(self)
+        ct.variables["TCONCURRENT_SANITIZER"] = self.options.with_sanitizer_support
+        ct.variables["TCONCURRENT_COROUTINES_TS"] = self.options.with_coroutines_ts
+        ct.variables["BUILD_SHARED_LIBS"] = self.options.shared
+        ct.variables["CMAKE_POSITION_INDEPENDENT_CODE"] = self.options.fPIC
+        ct.variables["BUILD_TESTING"] = self.should_build_tests
+        ct.variables["WITH_COVERAGE"] = self.options.coverage
+        ct.generate()
+
+        cd = CMakeDeps(self)
+        cd.generate()
+
     def build(self):
         cmake = CMake(self)
-        cmake.definitions["TCONCURRENT_SANITIZER"] = self.options.with_sanitizer_support
-        cmake.definitions["TCONCURRENT_COROUTINES_TS"] = self.options.with_coroutines_ts
-        cmake.definitions["BUILD_SHARED_LIBS"] = self.options.shared
-        cmake.definitions["CMAKE_POSITION_INDEPENDENT_CODE"] = self.options.fPIC
-        cmake.definitions["BUILD_TESTING"] = self.should_build_tests
-        cmake.definitions["WITH_COVERAGE"] = self.options.coverage
         cmake.configure()
         cmake.build()
-        cmake.install()
+        if self.should_install and self.develop:
+            cmake.install()
 
     def package_info(self):
         self.cpp_info.libs = ["tconcurrent"]

run-ci.py

@@ -37,8 +37,6 @@ def main() -> None:
     if args.home_isolation:
         user_home = Path.cwd() / ".cache" / "conan" / args.remote
 
-    tankerci.conan.update_config()
-
     if args.command == "build-and-test":
         src_path = Path.cwd()
         build_path = "."  # tankerci.cpp.Builder runs ctest from the build directory

test/CMakeLists.txt

@@ -1,7 +1,9 @@
+find_package(doctest CONFIG REQUIRED)
+
 add_library(tconcurrent_doctest_main STATIC
   main.cpp
 )
-target_link_libraries(tconcurrent_doctest_main PUBLIC CONAN_PKG::doctest)
+target_link_libraries(tconcurrent_doctest_main PUBLIC doctest::doctest)
 if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
   target_compile_definitions(tconcurrent_doctest_main PUBLIC DOCTEST_CONFIG_NO_POSIX_SIGNALS)
 endif()