diff --git a/tutorial/consuming_packages/conanfile_py/complete_conanfile.py b/tutorial/consuming_packages/conanfile_py/complete_conanfile.py index ed1aebb2..4722ed93 100644 --- a/tutorial/consuming_packages/conanfile_py/complete_conanfile.py +++ b/tutorial/consuming_packages/conanfile_py/complete_conanfile.py @@ -25,5 +25,8 @@ def layout(self): multi = True if self.settings.get_safe("compiler") == "msvc" else False if multi: self.folders.generators = os.path.join("build", "generators") + self.folders.build = "build" else: self.folders.generators = os.path.join("build", str(self.settings.build_type), "generators") + self.folders.build = os.path.join("build", str(self.settings.build_type)) + diff --git a/tutorial/consuming_packages/conanfile_py/run_example.py b/tutorial/consuming_packages/conanfile_py/run_example.py index 63964cc2..f4ff9b0c 100644 --- a/tutorial/consuming_packages/conanfile_py/run_example.py +++ b/tutorial/consuming_packages/conanfile_py/run_example.py @@ -20,12 +20,14 @@ def run_example(output_folder=""): run(" && ".join(command)) cmd_out = run("Release\\compressor.exe") else: - with chdir("build"): - gen_folder = "" if output_folder else "Release/generators/" + build_path = "build" if output_folder else "build/Release" + gen_folder = "" if output_folder else "generators/" + cmakelists_path = ".." if output_folder else "../.." + with chdir(build_path): command = [] # in the conanfile.py we only add CMake as tool_require in Linux command.append(f". ./{gen_folder}conanbuild.sh") - command.append(f"cmake .. -DCMAKE_TOOLCHAIN_FILE={gen_folder}conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release") + command.append(f"cmake {cmakelists_path} -DCMAKE_TOOLCHAIN_FILE={gen_folder}conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release") command.append("cmake --build .") command.append(f". ./{gen_folder}deactivate_conanbuild.sh") run(" && ".join(command))