diff --git a/conanfile.py b/conanfile.py index 21c3754e42c90869b3474d87fbc612aa3d097633..ac94604ff1efaf43b4dad4da99c0a746fd1488fc 100644 --- a/conanfile.py +++ b/conanfile.py @@ -23,7 +23,7 @@ from conans import ConanFile, CMake class ProjectPhoenix(ConanFile): name = "phx" - version = "17.07.0" + version = "17.09.0" license = "Apache License, Version 2.0" description = """Project Phoenix""" settings = "os", "compiler", "build_type", "arch" @@ -32,22 +32,21 @@ class ProjectPhoenix(ConanFile): ("catch/1.9.7@RWTH-VR/thirdparty"), ("cpplint/9883c51@RWTH-VR/thirdparty"), ("SDL2/2.0.5@RWTH-VR/thirdparty"), - ("trompeloeil/v25@rollbear/stable")) # comma separated list of requirements + ("trompeloeil/v25@rollbear/stable"), + ("freeimage/3.17.0@RWTH-VR/thirdparty") ) # comma separated list of requirements generators = "cmake" - + + + def configure(self): - self.options["glew"].shared = True + self.options["freeimage"].shared = True def imports(self): - self.copy("*.dll", dst="lib", src="bin") - #since cmake cannot easily tell Visual Studio where to find the dlls we have to do the following - self.copy("*.dll", dst="tests/Debug", src="bin") - self.copy("*.dll", dst="tests/Release", src="bin") + self.copy("*.dll", dst="bin", 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="demos/viewer/Release", src="bin") - self.copy("*.so", dst="lib", src="lib") - if self.settings.os == "Linux": - self.run("ln -s libGLEW.so lib/libGLEW.so.2.1") - - - + self.copy("*.so.*", dst="tests", src="lib") + self.copy("*.so", dst="tests", src="lib") + self.copy("*.so.2.1", dst="tests", src="lib") \ No newline at end of file