Skip to content
Snippets Groups Projects
Commit 007fafdf authored by jwendt's avatar jwendt
Browse files

Merge branch 'hotfix/conanfile_fix'

parents 4988bf65 2f57a68a
No related branches found
No related tags found
3 merge requests!148feature/#480_Create_a_smaller_test _mesh_for_combustion_demo,!141WIP: Resolve "Copy standard assets to build folder and remove resource path",!85WIP: Feature/234 continuous delivery
Show whitespace changes
Inline Side-by-side
Showing
with 7 additions and 8 deletions
conanfile.py
+ 7
− 8
View file @ 007fafdf
...@@ -36,17 +36,16 @@ class ProjectPhoenix(ConanFile): ...@@ -36,17 +36,16 @@ class ProjectPhoenix(ConanFile):
("freeimage/3.17.0@RWTH-VR/thirdparty")) # comma separated list of requirements ("freeimage/3.17.0@RWTH-VR/thirdparty")) # comma separated list of requirements
generators = "cmake" generators = "cmake"
def configure(self): def configure(self):
self.options["freeimage"].shared = True self.options["freeimage"].shared = True
self.options["glew"].shared = True
def imports(self): def imports(self):
self.copy("*.dll", dst="bin", src="bin") self.copy("*.dll", dst="lib", src="bin")
self.copy("*.dll", dst="tests/Debug", src="bin") self.copy("*.dll", dst="tests/Debug", src="bin")
self.copy("*.dll", dst="demos/viewer/Debug", src="bin")
self.copy("*.dll", dst="tests/Release", src="bin") self.copy("*.dll", dst="tests/Release", src="bin")
self.copy("*.dll", dst="demos/viewer/Debug", src="bin")
self.copy("*.dll", dst="demos/viewer/Release", src="bin") self.copy("*.dll", dst="demos/viewer/Release", src="bin")
self.copy("*.so.*", dst="tests", src="lib") self.copy("*.so", dst="lib", src="lib")
self.copy("*.so", dst="tests", src="lib") if self.settings.os == "Linux":
self.copy("*.so.2.1", dst="tests", src="lib") self.run("ln -s libGLEW.so lib/libGLEW.so.2.1")
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment