Skip to content
Snippets Groups Projects
Commit 1c9b8f07 authored by jwendt's avatar jwendt
Browse files

Update version number in conanfile.py for release 17.09.0

parent 2cc53e4d
No related branches found
No related tags found
1 merge request!19Release/v17.09.0
...@@ -23,7 +23,7 @@ from conans import ConanFile, CMake ...@@ -23,7 +23,7 @@ from conans import ConanFile, CMake
class ProjectPhoenix(ConanFile): class ProjectPhoenix(ConanFile):
name = "phx" name = "phx"
version = "17.07.0" version = "17.09.0"
license = "Apache License, Version 2.0" license = "Apache License, Version 2.0"
description = """Project Phoenix""" description = """Project Phoenix"""
settings = "os", "compiler", "build_type", "arch" settings = "os", "compiler", "build_type", "arch"
...@@ -32,22 +32,21 @@ class ProjectPhoenix(ConanFile): ...@@ -32,22 +32,21 @@ class ProjectPhoenix(ConanFile):
("catch/1.9.7@RWTH-VR/thirdparty"), ("catch/1.9.7@RWTH-VR/thirdparty"),
("cpplint/9883c51@RWTH-VR/thirdparty"), ("cpplint/9883c51@RWTH-VR/thirdparty"),
("SDL2/2.0.5@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" generators = "cmake"
def configure(self): def configure(self):
self.options["glew"].shared = True self.options["freeimage"].shared = True
def imports(self): def imports(self):
self.copy("*.dll", dst="lib", src="bin") self.copy("*.dll", dst="bin", 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/Debug", 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/Debug", src="bin")
self.copy("*.dll", dst="tests/Release", src="bin")
self.copy("*.dll", dst="demos/viewer/Release", src="bin") self.copy("*.dll", dst="demos/viewer/Release", src="bin")
self.copy("*.so", dst="lib", src="lib") self.copy("*.so.*", dst="tests", src="lib")
if self.settings.os == "Linux": self.copy("*.so", dst="tests", src="lib")
self.run("ln -s libGLEW.so lib/libGLEW.so.2.1") self.copy("*.so.2.1", dst="tests", src="lib")
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment