From 5f336a72113e9b1efeea400eed834d38a78afa32 Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Wed, 1 Jan 2020 15:22:51 +0100 Subject: [PATCH] More changes and fixes for Conan. --- .drone.yml | 3 +++ conanfile.py | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 0260c45..1b3bd6c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -35,6 +35,9 @@ steps: CONAN_PASSWORD: from_secret: conan_password commands: + - rm -rf build-debug + - rm -rf build-release + - rm -rf build-release-windows - cmake -DCMAKE_BUILD_TYPE=Release . -B build-conan -D CMAKE_C_COMPILER=/usr/bin/clang -D CMAKE_CXX_COMPILER=clang++ -DWINDOWS=0 - conan export-pkg . $DRONE_COMMIT@creaturelib/$DRONE_BRANCH --build-folder build-conan -s compiler='clang' -s compiler.version=8 -s compiler.libcxx='libstdc++11' - conan remote add epsilon-public https://packages.p-epsilon.com/artifactory/api/conan/epsilon-public diff --git a/conanfile.py b/conanfile.py index 310ea7c..1d3d7e9 100644 --- a/conanfile.py +++ b/conanfile.py @@ -28,8 +28,10 @@ class CreatureLibConan(ConanFile): def package(self): self.copy("*.hpp", dst="include", src="src") - self.copy("*.so", dst="lib", keep_path=True) - self.copy("*.dll", dst="lib", keep_path=True) + if self.settings.os == "Windows": + self.copy("*.dll", dst="lib", keep_path=True) + else: + self.copy("*.so", dst="lib", keep_path=True) def package_info(self): self.cpp_info.libs = ["CreatureLibCore", "CreatureLibLibrary", "CreatureLibBattling"]