From 7975b6402a244e96aeb042f069324f40c154182e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= Date: Fri, 23 Apr 2021 08:57:46 +0200 Subject: [PATCH] conan: put win dlls into bin directory --- appveyor.yml | 7 ++----- conanfile.py | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 649717e835..85328021d1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,7 +12,6 @@ environment: VCVARS: C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat ARCHITECTURE: x86_64 UNIT_TESTS: 1 - WEBREADY: False WARNINGS_AS_ERRORS: ON - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 CMAKE_GENERATOR: Ninja @@ -21,7 +20,6 @@ environment: VCVARS: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat ARCHITECTURE: x86_64 UNIT_TESTS: 1 - WEBREADY: False WARNINGS_AS_ERRORS: ON - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 CMAKE_GENERATOR: Ninja @@ -30,7 +28,6 @@ environment: VCVARS: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat ARCHITECTURE: x86_64 UNIT_TESTS: 1 - WEBREADY: False WARNINGS_AS_ERRORS: ON shallow_clone: true @@ -63,9 +60,9 @@ build_script: - cmd: cd build - cmd: call "%VCVARS%" x86_amd64 - cmd: conan --version - - cmd: conan install .. -o webready=%WEBREADY% --build missing + - cmd: conan install .. -o webready=False --build missing - cmd: echo %CMAKE_GENERATOR% - - cmd: cmake -G "%CMAKE_GENERATOR%" -DEXIV2_TEAM_WARNINGS_AS_ERRORS=%WARNINGS_AS_ERRORS% -DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_PNG=ON -DEXIV2_ENABLE_BMFF=ON -DEXIV2_ENABLE_WEBREADY=%WEBREADY% -DEXIV2_BUILD_UNIT_TESTS=%UNIT_TESTS% -DCMAKE_INSTALL_PREFIX=install .. + - cmd: cmake -G "%CMAKE_GENERATOR%" -DEXIV2_TEAM_WARNINGS_AS_ERRORS=%WARNINGS_AS_ERRORS% -DCMAKE_BUILD_TYPE=Release -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_PNG=ON -DEXIV2_ENABLE_BMFF=ON -DEXIV2_ENABLE_WEBREADY=OFF -DEXIV2_BUILD_UNIT_TESTS=%UNIT_TESTS% -DCMAKE_INSTALL_PREFIX=install .. - cmd: cmake --build . --config Release - cmd: cmake --build . --config Release --target install - cmd: cd bin diff --git a/conanfile.py b/conanfile.py index 1791064277..97c387c571 100644 --- a/conanfile.py +++ b/conanfile.py @@ -36,5 +36,5 @@ def requirements(self): self.requires('expat/2.2.7') def imports(self): - self.copy('*.dll', dst='conanDlls', src='bin') + self.copy('*.dll', dst='bin', src='bin') self.copy('*.dylib', dst='bin', src='lib')