diff --git a/.travis.yml b/.travis.yml index 854aca4..e07e281 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,8 @@ matrix: env: CONAN_GCC_VERSIONS=7 CONAN_DOCKER_IMAGE=conanio/gcc7 - <<: *linux env: CONAN_GCC_VERSIONS=8 CONAN_DOCKER_IMAGE=conanio/gcc8 + - <<: *linux + env: CONAN_GCC_VERSIONS=9 CONAN_DOCKER_IMAGE=conanio/gcc9 - <<: *linux env: CONAN_CLANG_VERSIONS=3.9 CONAN_DOCKER_IMAGE=conanio/clang39 - <<: *linux @@ -30,6 +32,8 @@ matrix: env: CONAN_CLANG_VERSIONS=6.0 CONAN_DOCKER_IMAGE=conanio/clang60 - <<: *linux env: CONAN_CLANG_VERSIONS=7.0 CONAN_DOCKER_IMAGE=conanio/clang7 + - <<: *linux + env: CONAN_CLANG_VERSIONS=8 CONAN_DOCKER_IMAGE=conanio/clang8 - <<: *osx osx_image: xcode7.3 env: CONAN_APPLE_CLANG_VERSIONS=7.3 diff --git a/appveyor.yml b/appveyor.yml index 6dc35f6..e86521b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,7 +4,6 @@ environment: PYTHON_HOME: "C:\\Python37" matrix: - #- MINGW_CONFIGURATIONS: '4.9@x86_64@seh@posix, 4.9@x86_64@sjlj@posix, 4.9@x86@sjlj@posix, 4.9@x86@dwarf2@posix, 6@x86_64@seh@posix, 7@x86_64@seh@posix' - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 CONAN_VISUAL_VERSIONS: 12 CONAN_BUILD_TYPES: Release @@ -23,6 +22,12 @@ environment: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 CONAN_VISUAL_VERSIONS: 15 CONAN_BUILD_TYPES: Debug + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + CONAN_VISUAL_VERSIONS: 16 + CONAN_BUILD_TYPES: Release + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + CONAN_VISUAL_VERSIONS: 16 + CONAN_BUILD_TYPES: Debug install: - set PATH=%PYTHON_HOME%;%PYTHON_HOME%/Scripts/;%PATH% diff --git a/conanfile.py b/conanfile.py index 3240af9..f3f36cc 100644 --- a/conanfile.py +++ b/conanfile.py @@ -35,7 +35,8 @@ def build_requirements(self): self.build_requires("msys2_installer/20161025@bincrafters/stable") def source(self): - tools.get("https://www.cairographics.org/releases/{}.tar.gz".format(self.folder)) + tools.get("https://www.cairographics.org/releases/{}.tar.gz".format(self.folder), + sha256="a7592bef0156d7c27545487a52245669b00cf7e70054505381cff2136d890ca8") if self.settings.os == 'Macos': # https://lists.freedesktop.org/archives/pixman/2014-November/003461.html @@ -84,6 +85,9 @@ def build(self): self.build_configure() def package(self): + la = os.path.join(self.package_folder, "lib", "libpixman-1.la") + if os.path.isfile(la): + os.unlink(la) if self.settings.compiler == "Visual Studio": self.copy(pattern="*.lib", dst="lib", keep_path=False) self.copy(pattern="*.pdb", dst="lib", keep_path=False)