feat: Add CONAN_RUNTIME_LIB_DIRS to the conan_toolchain.cmake

conan/tools/cmake/toolchain/blocks.py

@@ -480,6 +480,9 @@ class FindFiles(Block):
         {% if cmake_include_path %}
         list(PREPEND CMAKE_INCLUDE_PATH {{ cmake_include_path }})
         {% endif %}
+        {% if host_lib_dirs %}
+        list(PREPEND CONAN_RUNTIME_LIB_DIRS {{ host_lib_dirs }})
+        {% endif %}
 
         {% if cross_building %}
         if(NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PACKAGE OR CMAKE_FIND_ROOT_PATH_MODE_PACKAGE STREQUAL "ONLY")
@@ -518,12 +521,14 @@ def context(self):
             find_package_prefer_config = "OFF"
 
         is_apple_ = is_apple_os(self._conanfile)
+        is_win = self._conanfile.settings.get_safe("os") == "Windows"
 
         # Read information from host context
         # TODO: Add here in 2.0 the "skip": False trait
         host_req = self._conanfile.dependencies.filter({"build": False}).values()
         build_paths = []
         host_lib_paths = []
+        host_lib_dirs = []
         host_framework_paths = []
         host_include_paths = []
         for req in host_req:
@@ -533,6 +538,10 @@ def context(self):
             if is_apple_:
                 host_framework_paths.extend(cppinfo.frameworkdirs)
             host_include_paths.extend(cppinfo.includedirs)
+            if is_win:
+                host_lib_dirs.extend(cppinfo.bindirs)
+            else:
+                host_lib_dirs.extend(cppinfo.libdirs)
 
         # Read information from build context
         build_req = self._conanfile.dependencies.build.values()
@@ -552,6 +561,7 @@ def context(self):
             "cmake_include_path": self._join_paths(host_include_paths),
             "is_apple": is_apple_,
             "cross_building": cross_building(self._conanfile),
+            "host_lib_dirs": self._join_paths(host_lib_dirs)
         }
 
 

conans/test/integration/lockfile/test_lock_requires_revisions.py

@@ -132,20 +132,20 @@ def requirements(self):
     client.run("install consumer --lockfile=consumer.lock -s os=Windows -s:b os=Windows")
     assert "REV1!!!" in client.out
     assert "REV2!!!" not in client.out
-    assert "nix" not in client.out
+    assert "nix/0.1" not in client.out
     client.run("install consumer -s os=Windows -s:b os=Windows")
     assert "REV2!!!" in client.out
     assert "REV1!!!" not in client.out
-    assert "nix" not in client.out
+    assert "nix/0.1" not in client.out
 
     client.run("install consumer --lockfile=consumer.lock -s os=Linux -s:b os=Linux")
     assert "REV1!!!" in client.out
     assert "REV2!!!" not in client.out
-    assert "win" not in client.out
+    assert "win/0.1" not in client.out
     client.run("install consumer -s os=Linux -s:b os=Linux")
     assert "REV2!!!" in client.out
     assert "REV1!!!" not in client.out
-    assert "win" not in client.out
+    assert "win/0.1" not in client.out
 
 
 @pytest.mark.parametrize("requires", ["requires", "tool_requires"])

conans/test/integration/toolchains/cmake/test_cmaketoolchain.py

@@ -1,6 +1,7 @@
 import json
 import os
 import platform
+import re
 import textwrap
 
 import pytest
@@ -352,6 +353,55 @@ def generate(self):
         assert "/path/to/builddir" in contents
 
 
+@pytest.fixture
+def lib_dir_setup():
+    client = TestClient()
+    conanfile = textwrap.dedent("""
+            from conan import ConanFile
+
+            class Conan(ConanFile):
+
+                def package_info(self):
+                    self.cpp_info.builddirs = ["/path/to/builddir"]
+            """)
+    client.save({"conanfile.py": conanfile})
+    client.run("create . --name=dep --version=1.0")
+
+    conanfile = (GenConanfile().with_requires("dep/1.0").with_generator("CMakeToolchain")
+                 .with_settings("os", "arch", "compiler", "build_type"))
+
+    client.save({"conanfile.py": conanfile})
+    client.run("install . ")
+    return client
+
+
+@pytest.mark.skipif(platform.system() != "Windows", reason="Only Windows")
+def test_lib_dirs_windows(lib_dir_setup):
+    client = lib_dir_setup
+
+    contents = client.load("conan_toolchain.cmake")
+    pattern_lib_path = r'list\(PREPEND CMAKE_LIBRARY_PATH "(.*?)"\)'
+    pattern_lib_dirs = r'list\(PREPEND CONAN_RUNTIME_LIB_DIRS "(.*?)"\)'
+    lib_path_group = re.search(pattern_lib_path, contents).groups()
+    lib_dirs_group = re.search(pattern_lib_dirs, contents).groups()
+
+    assert len(lib_path_group) == len(lib_dirs_group)
+    assert all(lib_dir[-3:] == "bin" for lib_dir in lib_dirs_group)
+
+
+@pytest.mark.skipif(platform.system() == "Windows", reason="Only Linux and OSX")
+def test_lib_dirs_no_windows(lib_dir_setup):
+    client = lib_dir_setup
+
+    contents = client.load("conan_toolchain.cmake")
+    pattern_lib_path = r'list\(PREPEND CMAKE_LIBRARY_PATH (.*)\)'
+    pattern_lib_dirs = r'list\(PREPEND CONAN_RUNTIME_LIB_DIRS (.*)\)'
+    lib_path = re.search(pattern_lib_path, contents).group(1)
+    lib_dirs = re.search(pattern_lib_dirs, contents).group(1)
+
+    assert lib_path == lib_dirs
+
+
 @pytest.mark.skipif(platform.system() != "Darwin", reason="Only OSX")
 def test_cmaketoolchain_cmake_system_processor_cross_apple():
     """