From 716640a4770c8e11ab5f6e6ebb8db64868c2679b Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Fri, 26 Jul 2019 18:57:59 +0300 Subject: Provisioning: update Conan and Conan packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [*] Update Conan to 1.17.0, adjust to change in command line arguments [*] Update Conan packages to up-to-date versions, add libjpeg-turbo and packages for 64-bit MinGW [*] Rename 03-conan.ps1 to 11-conan.ps1 so that it is installed after Python 3 and MinGW [*] Add license header to conan.ps1 Change-Id: Ibc451ddc54a7227eb6d3a007a20351e77a46875f Reviewed-by: Mårten Nordheim --- .../zlib/1.2.11/qtproject/stable/export/conanmanifest.txt | 7 +++++++ .../5a14faea650589a68f33a6a5b0207a4a852a5f1d/conanmanifest.txt | 9 +++++++++ 2 files changed, 16 insertions(+) create mode 100644 coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/export/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/package/5a14faea650589a68f33a6a5b0207a4a852a5f1d/conanmanifest.txt (limited to 'coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable') diff --git a/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/export/conanmanifest.txt new file mode 100644 index 00000000..6b51b7b6 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/export/conanmanifest.txt @@ -0,0 +1,7 @@ +1563296424 +FindZLIB.cmake: 0ec128c2f97a3a6d7e800d3204e5c94f +LICENSE: 1ac8330e79e050867144e174d80880f7 +conanfile.py: c7aba1a732c28bb9851cb50acf3f7a4d +export_source/CMakeLists.txt: b45a8f19ed120e922c1cb720c0e4a7c7 +export_source/CMakeLists_minizip.txt: 7b2c2a9ab51d0ba37b5ca35da21579b7 +export_source/minizip.patch: dc8ffe80d334f8e5b1bb967593fe2d4a diff --git a/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/package/5a14faea650589a68f33a6a5b0207a4a852a5f1d/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/package/5a14faea650589a68f33a6a5b0207a4a852a5f1d/conanmanifest.txt new file mode 100644 index 00000000..45447d86 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/package/5a14faea650589a68f33a6a5b0207a4a852a5f1d/conanmanifest.txt @@ -0,0 +1,9 @@ +1563296480 +FindZLIB.cmake: 0ec128c2f97a3a6d7e800d3204e5c94f +conaninfo.txt: 40e76e93e86476bbd92e1e82b71d04bb +include/zconf.h: 931d0dd891d90ace1eab7a46125a8bda +include/zlib.h: 0338828e9d00c94645648b1517108324 +lib/libzlib.a: 5dc51a25ecef8f9c97e6b67cec736634 +lib/pkgconfig/zlib.pc: 29adeed07108745c3562dc19343f3d99 +licenses/LICENSE: 1af2e5353c16e930435fff550f827c3e +zlib.pc: 29adeed07108745c3562dc19343f3d99 -- cgit v1.2.3