diff --git a/CMakeLists.txt b/CMakeLists.txt
index 26230b5..386789d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,7 @@ cmake_minimum_required(VERSION 3.28)
 
 # Generate compile commands for anyone using our libraries.
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+set(CMAKE_CXX_SCAN_FOR_MODULES ON)
 # The rest are self explanatory...
 set(CMAKE_COLOR_DIAGNOSTICS ON)
 set(BUILD_UNIT_TESTS ON)
diff --git a/conanfile.py b/conanfile.py
index a9f3598..1ba6b92 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -77,6 +77,11 @@ def _validate_compiler_version(self):
         if version < min_version:
             raise ConanInvalidConfiguration(error_msg)
 
+    def set_version(self):
+        # Use latest if not specified via command line
+        if not self.version:
+            self.version = "latest"
+
     def validate(self):
         if self.settings.get_safe("compiler.cppstd"):
             check_min_cppstd(self, self._min_cppstd)
@@ -98,6 +103,7 @@ def layout(self):
 
     def generate(self):
         tc = CMakeToolchain(self)
+        tc.generator = "Ninja"
         tc.generate()
 
         deps = CMakeDeps(self)
diff --git a/test_package/CMakeLists.txt b/test_package/CMakeLists.txt
index ee0c39e..b8f1524 100644
--- a/test_package/CMakeLists.txt
+++ b/test_package/CMakeLists.txt
@@ -16,6 +16,7 @@ cmake_minimum_required(VERSION 4.0)
 
 # Generate compile commands for anyone using our libraries.
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+set(CMAKE_CXX_SCAN_FOR_MODULES ON)
 set(CMAKE_COLOR_DIAGNOSTICS ON)
 
 project(test_package LANGUAGES CXX)
diff --git a/test_package/conanfile.py b/test_package/conanfile.py
index c76718b..d2e785b 100644
--- a/test_package/conanfile.py
+++ b/test_package/conanfile.py
@@ -36,6 +36,7 @@ def layout(self):
 
     def generate(self):
         tc = CMakeToolchain(self)
+        tc.generator = "Ninja"
         tc.generate()
 
         deps = CMakeDeps(self)