From 78b861910abca9a33e6247176fd3ee9b7df5fb0b Mon Sep 17 00:00:00 2001 From: memsharded Date: Tue, 30 Apr 2024 09:29:30 +0200 Subject: [PATCH 1/2] fix CMake folder when running on drive --- conan/tools/cmake/cmake.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/conan/tools/cmake/cmake.py b/conan/tools/cmake/cmake.py index 02a80b39cd7..6af622fc475 100644 --- a/conan/tools/cmake/cmake.py +++ b/conan/tools/cmake/cmake.py @@ -85,10 +85,9 @@ def configure(self, variables=None, build_script_folder=None, cli_args=None, cmakelist_folder = self._conanfile.source_folder if build_script_folder: cmakelist_folder = os.path.join(self._conanfile.source_folder, build_script_folder) + cmakelist_folder = cmakelist_folder.replace("\\", "/") build_folder = self._conanfile.build_folder - generator_folder = self._conanfile.generators_folder - mkdir(self._conanfile, build_folder) arg_list = [self._cmake_program] From e3143b611af4dfbb39684fe9b6f5ca87ad9e5bbc Mon Sep 17 00:00:00 2001 From: memsharded Date: Tue, 30 Apr 2024 10:10:37 +0200 Subject: [PATCH 2/2] fix unit test --- .../test/unittests/tools/cmake/test_cmake_presets_definitions.py | 1 + 1 file changed, 1 insertion(+) diff --git a/conans/test/unittests/tools/cmake/test_cmake_presets_definitions.py b/conans/test/unittests/tools/cmake/test_cmake_presets_definitions.py index ff1cdaa6b28..8e06972d472 100644 --- a/conans/test/unittests/tools/cmake/test_cmake_presets_definitions.py +++ b/conans/test/unittests/tools/cmake/test_cmake_presets_definitions.py @@ -45,6 +45,7 @@ def run(command, **kwargs): assert '-DCMAKE_MAKE_PROGRAM="C:/mymake.exe"' in command conanfile.run = run + conanfile.folders.set_base_source(temp_folder()) conanfile.conf.define("tools.gnu:make_program", "C:\\mymake.exe") with mock.patch("platform.system", mock.MagicMock(return_value='Windows')):