(#12568) Fix license and url of libcurl in conanfile.py

* Fix license and url of libcurl in conanfile.py

libcurl is provided under "curl" license - see https://curl.se/docs/copyright.html and https://spdx.org/licenses/curl.html
URL is https://curl.se

* Set license to MIT for versions before 7.10.4

(patch provided by uilianries)

* Update Conan tools imports

Signed-off-by: Uilian Ries <uilianries@gmail.com>

Signed-off-by: Uilian Ries <uilianries@gmail.com>
Co-authored-by: Uilian Ries <uilianries@gmail.com>
This commit is contained in:
BjoernAtBosch
2022-09-09 13:24:10 +02:00
committed by GitHub
parent 56721e45dc
commit 64e1df29ac
2 changed files with 63 additions and 57 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -1,4 +1,5 @@
from conans import ConanFile, CMake, tools
from conans import ConanFile, CMake
from conan.tools.build import cross_building
import os
import subprocess
import re
@@ -30,7 +31,7 @@ class TestPackageConan(ConanFile):
return os.path.join("bin", "test_package")
def test(self):
if not tools.cross_building(self):
if not cross_building(self):
self.run(self._test_executable, run_environment=True)
else:
# We will dump information for the generated executable