Skip to content

Commit 728b808

Browse files
authored
πŸ› Explicitly set Ninja generator & set_version latest (#69)
1 parent 7471f48 commit 728b808

4 files changed

Lines changed: 9 additions & 0 deletions

File tree

β€ŽCMakeLists.txtβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ cmake_minimum_required(VERSION 3.28)
1616

1717
# Generate compile commands for anyone using our libraries.
1818
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
19+
set(CMAKE_CXX_SCAN_FOR_MODULES ON)
1920
# The rest are self explanatory...
2021
set(CMAKE_COLOR_DIAGNOSTICS ON)
2122
set(BUILD_UNIT_TESTS ON)

β€Žconanfile.pyβ€Ž

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

80+
def set_version(self):
81+
# Use latest if not specified via command line
82+
if not self.version:
83+
self.version = "latest"
84+
8085
def validate(self):
8186
if self.settings.get_safe("compiler.cppstd"):
8287
check_min_cppstd(self, self._min_cppstd)
@@ -98,6 +103,7 @@ def layout(self):
98103

99104
def generate(self):
100105
tc = CMakeToolchain(self)
106+
tc.generator = "Ninja"
101107
tc.generate()
102108

103109
deps = CMakeDeps(self)

β€Žtest_package/CMakeLists.txtβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ cmake_minimum_required(VERSION 4.0)
1616

1717
# Generate compile commands for anyone using our libraries.
1818
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
19+
set(CMAKE_CXX_SCAN_FOR_MODULES ON)
1920
set(CMAKE_COLOR_DIAGNOSTICS ON)
2021

2122
project(test_package LANGUAGES CXX)

β€Žtest_package/conanfile.pyβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ def layout(self):
3636

3737
def generate(self):
3838
tc = CMakeToolchain(self)
39+
tc.generator = "Ninja"
3940
tc.generate()
4041

4142
deps = CMakeDeps(self)

0 commit comments

Comments
Β (0)