diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml index 1c9aa53590..dd655b1d9f 100644 --- a/.github/workflows/cura-installer.yml +++ b/.github/workflows/cura-installer.yml @@ -175,13 +175,13 @@ jobs: - name: Install OpenSSL shared run: conan install openssl/1.1.1l@_/_ --build=missing --update -o openssl:shared=True -g deploy - - name: Install OpenSSL shared (Bash) + - name: Copy OpenSSL shared (Bash) if: ${{ runner.os != 'Windows' }} run: | cp ./openssl/lib/*.so* ./cura_inst/bin/ || true cp ./openssl/lib/*.dylib* ./cura_inst/bin/ || true - - name: Install OpenSSL shared (Powershell) + - name: Copy OpenSSL shared (Powershell) if: ${{ runner.os == 'Windows' }} run: | cp openssl/bin/*.dll ./cura_inst/Scripts/ diff --git a/conanfile.py b/conanfile.py index 99b2fb1fe4..05e93d4065 100644 --- a/conanfile.py +++ b/conanfile.py @@ -171,6 +171,12 @@ class CuraConan(ConanFile): for bin in src_path.glob(binary["binary"]): binaries.append((str(bin), binary["dst"])) + # Add dynamic libs in the venv bin/Script and lib Path. This is needed because we might copy some additional libs + # e.q.: OpenSSL 1.1.1l in that directory with a separate: + # `conan install openssl@1.1.1l -g deploy && cp openssl/bin/*.so cura_inst/bin` + for bin in self._script_dir.glob("*.[so|dll|dylib]"): + binaries.append(str(bin), ".") + for _, dependency in self.dependencies.items(): # if dependency.ref.name == "cpython": # continue