Skip to content

Commit 0f64974

Browse files
authored
🐛 (patch) Fix test_package, add Ninja generator (#47)
LLVM and gnu toolchains will no longer automatically enable this option and thus we must enable it on each cmake project.
1 parent 6ac3501 commit 0f64974

File tree

4 files changed

+17
-2
lines changed

4 files changed

+17
-2
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ cmake_minimum_required(VERSION 4.0)
1717
# Generate compile commands for anyone using our libraries.
1818
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
1919
set(CMAKE_COLOR_DIAGNOSTICS ON)
20+
set(CMAKE_CXX_SCAN_FOR_MODULES ON)
2021

2122
project(strong_ptr LANGUAGES CXX)
2223

conanfile.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,11 @@ def _validate_compiler_version(self):
7878
if version < min_version:
7979
raise ConanInvalidConfiguration(error_msg)
8080

81+
def set_version(self):
82+
# Use latest if not specified via command line
83+
if not self.version:
84+
self.version = "latest"
85+
8186
def validate(self):
8287
if self.settings.get_safe("compiler.cppstd"):
8388
check_min_cppstd(self, self._min_cppstd)

test_package/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ cmake_minimum_required(VERSION 4.0)
1717
# Generate compile commands for anyone using our libraries.
1818
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
1919
set(CMAKE_COLOR_DIAGNOSTICS ON)
20+
set(CMAKE_CXX_SCAN_FOR_MODULES ON)
2021

2122
project(test_package LANGUAGES CXX)
2223

test_package/conanfile.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616

1717
from conan import ConanFile
1818
from conan.tools.build import cross_building
19-
from conan.tools.cmake import CMake, cmake_layout
19+
from conan.tools.cmake import CMake, cmake_layout, CMakeToolchain, CMakeDeps
2020
from pathlib import Path
2121

2222

2323
class TestPackageConan(ConanFile):
2424
settings = "os", "arch", "compiler", "build_type"
25-
generators = "VirtualRunEnv", "CMakeDeps", "CMakeToolchain"
25+
generators = "VirtualRunEnv"
2626

2727
def build_requirements(self):
2828
self.tool_requires("cmake/[^4.0.0]")
@@ -31,6 +31,14 @@ def build_requirements(self):
3131
def requirements(self):
3232
self.requires(self.tested_reference_str)
3333

34+
def generate(self):
35+
tc = CMakeToolchain(self)
36+
tc.generator = "Ninja"
37+
tc.generate()
38+
39+
deps = CMakeDeps(self)
40+
deps.generate()
41+
3442
def layout(self):
3543
cmake_layout(self)
3644

0 commit comments

Comments
 (0)