More changes and fixes for Conan.
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
parent
6d18282152
commit
5f336a7211
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
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"]
|
||||
|
|
Loading…
Reference in New Issue