Deukhoofd
/
CreatureLib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More changes and fixes for Conan.
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Deukhoofd 2020-01-01 15:22:51 +01:00
parent 6d18282152
commit 5f336a7211
Signed by: Deukhoofd
GPG Key ID: ADF2E9256009EDCE
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.drone.yml
View File

@ -35,6 +35,9 @@ steps:
CONAN_PASSWORD: CONAN_PASSWORD:
from_secret: conan_password from_secret: conan_password
commands: 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 - 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 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 - conan remote add epsilon-public https://packages.p-epsilon.com/artifactory/api/conan/epsilon-public

4
conanfile.py
View File

@ -28,8 +28,10 @@ class CreatureLibConan(ConanFile):
def package(self): def package(self):
self.copy("*.hpp", dst="include", src="src") self.copy("*.hpp", dst="include", src="src")
self.copy("*.so", dst="lib", keep_path=True) if self.settings.os == "Windows":
self.copy("*.dll", dst="lib", keep_path=True) self.copy("*.dll", dst="lib", keep_path=True)
else:
self.copy("*.so", dst="lib", keep_path=True)
def package_info(self): def package_info(self):
self.cpp_info.libs = ["CreatureLibCore", "CreatureLibLibrary", "CreatureLibBattling"] self.cpp_info.libs = ["CreatureLibCore", "CreatureLibLibrary", "CreatureLibBattling"]