diff --git a/conan_provider.cmake b/conan_provider.cmake index e6f00e8a..98b4da1e 100644 --- a/conan_provider.cmake +++ b/conan_provider.cmake @@ -360,11 +360,11 @@ macro(conan_provide_dependency method package_name) get_property(_MULTICONFIG_GENERATOR GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) if(NOT _MULTICONFIG_GENERATOR) message(STATUS "CMake-Conan: Installing single configuration ${CMAKE_BUILD_TYPE}") - conan_install(-pr ${CMAKE_BINARY_DIR}/conan_host_profile --build=missing -g CMakeDeps) + conan_install(-pr ${CMAKE_BINARY_DIR}/conan_host_profile --build=missing) else() message(STATUS "CMake-Conan: Installing both Debug and Release") - conan_install(-pr ${CMAKE_BINARY_DIR}/conan_host_profile -s build_type=Release --build=missing -g CMakeDeps) - conan_install(-pr ${CMAKE_BINARY_DIR}/conan_host_profile -s build_type=Debug --build=missing -g CMakeDeps) + conan_install(-pr ${CMAKE_BINARY_DIR}/conan_host_profile -s build_type=Release --build=missing) + conan_install(-pr ${CMAKE_BINARY_DIR}/conan_host_profile -s build_type=Debug --build=missing) endif() unset(_MULTICONFIG_GENERATOR) else() diff --git a/example/conanfile.txt b/example/conanfile.txt index e83f3c89..b6ae8b25 100644 --- a/example/conanfile.txt +++ b/example/conanfile.txt @@ -1,5 +1,8 @@ [requires] fmt/9.1.0 +[generators] +CMakeDeps + [layout] -cmake_layout \ No newline at end of file +cmake_layout diff --git a/tests/resources/basic/conanfile.txt b/tests/resources/basic/conanfile.txt index c288051b..6fb88892 100644 --- a/tests/resources/basic/conanfile.txt +++ b/tests/resources/basic/conanfile.txt @@ -2,3 +2,6 @@ hello/0.1 bye/0.1 boost/1.77.0 + +[generators] +CMakeDeps diff --git a/tests/resources/fake_boost_recipe/conanfile.py b/tests/resources/fake_boost_recipe/conanfile.py index b374c5d7..93109e31 100644 --- a/tests/resources/fake_boost_recipe/conanfile.py +++ b/tests/resources/fake_boost_recipe/conanfile.py @@ -7,13 +7,6 @@ class BoostRecipe(ConanFile): version = "1.77.0" package_type = "library" - # Optional metadata - license = "" - author = " " - url = "" - description = "" - topics = ("", "", "") - # Binary configuration settings = "os", "compiler", "build_type", "arch" options = {"shared": [True, False], "fPIC": [True, False]} diff --git a/tests/resources/libbye/conanfile.py b/tests/resources/libbye/conanfile.py index b3e495ae..d52b5194 100644 --- a/tests/resources/libbye/conanfile.py +++ b/tests/resources/libbye/conanfile.py @@ -7,13 +7,6 @@ class byeRecipe(ConanFile): version = "0.1" package_type = "library" - # Optional metadata - license = "" - author = " " - url = "" - description = "" - topics = ("", "", "") - # Binary configuration settings = "os", "compiler", "build_type", "arch" options = {"shared": [True, False], "fPIC": [True, False]} diff --git a/tests/resources/subdir/conanfile.txt b/tests/resources/subdir/conanfile.txt index 8e7278bd..06a13db1 100644 --- a/tests/resources/subdir/conanfile.txt +++ b/tests/resources/subdir/conanfile.txt @@ -2,3 +2,6 @@ hello/0.1 bye/0.1 subdir/0.1 + +[generators] +CMakeDeps