-
Notifications
You must be signed in to change notification settings - Fork 254
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix for CMakeDeps generator being duplicated when using a conanfile.py (
#584) * Fix for CMakeDeps generator being duplicated when using a conanfile.py --------- Co-authored-by: Luis Caro Campos <[email protected]>
- Loading branch information
1 parent
9376d81
commit bd279af
Showing
6 changed files
with
89 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
tests/resources/change_generators/duplicate_generator/conanfile.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
from conan import ConanFile | ||
from conan.tools.cmake import CMakeDeps | ||
|
||
class testRecipe(ConanFile): | ||
settings = "os", "compiler", "build_type", "arch" | ||
generators = "CMakeToolchain", "CMakeDeps" | ||
|
||
def requirements(self): | ||
self.requires("hello/0.1") | ||
self.requires("bye/0.1") | ||
|
||
def generate(self): | ||
deps = CMakeDeps(self) | ||
deps.generate() | ||
|
8 changes: 8 additions & 0 deletions
8
tests/resources/change_generators/no_generator_py/conanfile.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
from conan import ConanFile | ||
|
||
class testRecipe(ConanFile): | ||
settings = "os", "compiler", "build_type", "arch" | ||
|
||
def requirements(self): | ||
self.requires("hello/0.1") | ||
self.requires("bye/0.1") |
3 changes: 3 additions & 0 deletions
3
tests/resources/change_generators/no_generator_txt/conanfile.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
[requires] | ||
hello/0.1 | ||
bye/0.1 |
13 changes: 13 additions & 0 deletions
13
tests/resources/change_generators/single_generator/conanfile.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
from conan import ConanFile | ||
from conan.tools.cmake import CMakeDeps | ||
|
||
class testRecipe(ConanFile): | ||
settings = "os", "compiler", "build_type", "arch" | ||
|
||
def requirements(self): | ||
self.requires("hello/0.1") | ||
self.requires("bye/0.1") | ||
|
||
def generate(self): | ||
deps = CMakeDeps(self) | ||
deps.generate() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters