📌 Cleanup some of the code & dependencies (#31)

Author: kammce

CMakeLists.txt

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 3.30)
+cmake_minimum_required(VERSION 4.0)
 
 # Generate compile commands for anyone using our libraries.
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
@@ -57,6 +57,8 @@ install(
 if(CMAKE_CROSSCOMPILING)
     message(STATUS "Cross compiling, skipping unit test execution")
 else()
+    message(STATUS "Building unit tests!")
+
     find_package(ut REQUIRED)
     add_executable(strong_ptr_unit_test)
     target_sources(strong_ptr_unit_test PUBLIC
@@ -90,7 +92,6 @@ else()
 
     target_link_libraries(strong_ptr_unit_test PRIVATE Boost::ut strong_ptr)
 
-    message(STATUS "Executing unit tests!")
     add_custom_target(run_tests ALL
       DEPENDS strong_ptr_unit_test
       COMMAND strong_ptr_unit_test

conanfile.py

@@ -85,8 +85,8 @@ def validate(self):
         self._validate_compiler_version()
 
     def build_requirements(self):
-        # Provides CMake, Ninja, & toolchain scripts for enabling modules
-        self.tool_requires("cmake-modules-toolchain/1.0.2")
+        self.tool_requires("cmake/[^4.0.0]")
+        self.tool_requires("ninja/[^1.3.0]")
         self.test_requires("boost-ext-ut/2.3.1",
                            options={'disable_module': False})
 
@@ -98,6 +98,7 @@ def layout(self):
 
     def generate(self):
         tc = CMakeToolchain(self)
+        tc.generator = "Ninja"
         tc.generate()
 
         deps = CMakeDeps(self)

test_package/conanfile.py

@@ -16,30 +16,24 @@
 
 from conan import ConanFile
 from conan.tools.build import cross_building
-from conan.tools.cmake import CMake, cmake_layout, CMakeToolchain, CMakeDeps
+from conan.tools.cmake import CMake, cmake_layout
 from pathlib import Path
 
 
 class TestPackageConan(ConanFile):
     settings = "os", "arch", "compiler", "build_type"
-    generators = "VirtualRunEnv"
+    generators = "VirtualRunEnv", "CMakeDeps", "CMakeToolchain"
 
     def build_requirements(self):
-        self.tool_requires("cmake-modules-toolchain/1.0.2")
+        self.tool_requires("cmake/[^4.0.0]")
+        self.tool_requires("ninja/[^1.3.0]")
 
     def requirements(self):
         self.requires(self.tested_reference_str)
 
     def layout(self):
         cmake_layout(self)
 
-    def generate(self):
-        tc = CMakeToolchain(self)
-        tc.generate()
-
-        deps = CMakeDeps(self)
-        deps.generate()
-
     def build(self):
         cmake = CMake(self)
         cmake.configure()