diff --git a/conanfile.py b/conanfile.py index ad76b393fc..23de4359ba 100644 --- a/conanfile.py +++ b/conanfile.py @@ -4,7 +4,7 @@ class Exiv2Conan(ConanFile): settings = 'os', 'compiler', 'build_type', 'arch' - generators = 'cmake' + generators = 'cmake_find_package', 'cmake_paths' options = {'unitTests': [True, False], 'xmp': [True, False], 'iconv': [True, False], @@ -17,39 +17,26 @@ class Exiv2Conan(ConanFile): ) def configure(self): - self.options['libcurl'].shared = False - self.options['libcurl'].with_openssl = True - self.options['gtest'].shared = True + self.options['libcurl'].shared = True + self.options['gtest'].shared = False def requirements(self): - self.requires('zlib/1.2.11@conan/stable') + self.requires('zlib/1.2.11') + self.requires('libcurl/7.75.0') if os_info.is_windows and self.options.iconv: - self.requires('libiconv/1.15@bincrafters/stable') + self.requires('libiconv/1.16') if self.options.unitTests: - if self.settings.compiler == "Visual Studio" and Version(self.settings.compiler.version.value) <= "12": - self.requires('gtest/1.8.0@bincrafters/stable') - else: - self.requires('gtest/1.8.1@bincrafters/stable') - - if self.options.webready and not os_info.is_macos: - # Note: This difference in versions is just due to a combination of corner cases in the - # recipes and the OS & compiler versions used in Travis and AppVeyor. In normal cases we - # could use any of the versions.Also note that the issue was not with libcurl but with - # libopenssl (a transitive dependency) - if os_info.is_windows: - self.requires('libcurl/7.69.1') - self.options['libcurl'].with_openssl = False - self.options['libcurl'].with_winssl = True - else: - self.requires('libcurl/7.64.1@bincrafters/stable') + self.requires('gtest/1.10.0') + if self.settings.build_type == "Debug": + self.options['gtest'].debug_postfix = '' if self.options.xmp: self.requires('XmpSdk/2016.7@piponazo/stable') # from conan-piponazo else: - self.requires('Expat/2.2.6@pix4d/stable') + self.requires('expat/2.3.0') def imports(self): - self.copy('*.dll', dst='conanDlls', src='bin') + self.copy('*.dll', dst='bin', src='bin') self.copy('*.dylib', dst='bin', src='lib')