diff --git a/conan_provider.cmake b/conan_provider.cmake index 0d2be004..3dbd0787 100644 --- a/conan_provider.cmake +++ b/conan_provider.cmake @@ -594,6 +594,11 @@ macro(conan_provide_dependency method package_name) conan_install(${_host_profile_flags} ${_build_profile_flags} -s build_type=Release ${CONAN_INSTALL_ARGS} ${generator}) conan_install(${_host_profile_flags} ${_build_profile_flags} -s build_type=Debug ${CONAN_INSTALL_ARGS} ${generator}) endif() + get_property(_conan_generators_folder GLOBAL PROPERTY CONAN_GENERATORS_FOLDER) + if(EXISTS "${_conan_generators_folder}/conan_cmakedeps_paths.cmake") + message(STATUS "CMake-Conan: Loading conan_cmakedeps_paths.cmake file") + include(${_conan_generators_folder}/conan_cmakedeps_paths.cmake) + endif() unset(_host_profile_flags) unset(_build_profile_flags) unset(_multiconfig_generator) diff --git a/example/new_cmakedeps_profile b/example/new_cmakedeps_profile new file mode 100644 index 00000000..75293ef2 --- /dev/null +++ b/example/new_cmakedeps_profile @@ -0,0 +1,8 @@ +# To test the new incubating CMakeDeps + cmake-conan +# cmake -B build -S . -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=../conan_provider.cmake -DCONAN_HOST_PROFILE="auto-cmake;../new_cmakedeps_profile" + +[options] +*:shared=True + +[conf] +tools.cmake.cmakedeps:new=will_break_next