diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2019-07-26 18:57:59 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2019-07-26 19:52:45 +0300 |
| commit | 716640a4770c8e11ab5f6e6ebb8db64868c2679b (patch) | |
| tree | a706c8e592f629a87cb99c72171409a8207319a6 /coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export | |
| parent | 4bf0ba2ba18e0caf2e4e99ab68a1f506a9eb3705 (diff) | |
Provisioning: update Conan and Conan packages
[*] 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 <marten.nordheim@qt.io>
Diffstat (limited to 'coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export')
| -rw-r--r-- | coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt deleted file mode 100644 index d7806e94..00000000 --- a/coin/provisioning/common/windows/conan_manifests/zlib/1.2.8/annulen/stable/export/conanmanifest.txt +++ /dev/null @@ -1,4 +0,0 @@ -1479836260 -CMakeLists.txt: 6ce169fb0b2f6eaa5d054d1dc007fc81 -FindZLIB.cmake: 4b85e65d40b77da736416f28e5931e56 -conanfile.py: e8de244463aa84c51238f1fd22a1ae00
\ No newline at end of file |