diff --git a/util/conan-package/conanfile.py b/util/conan-package/conanfile.py index d89db047..fab784b4 100644 --- a/util/conan-package/conanfile.py +++ b/util/conan-package/conanfile.py @@ -3,18 +3,15 @@ from conans import ConanFile class GlmConan(ConanFile): name = "glm" - version = "master" + version = "0.9.8.5" generators = "txt" - url="https://github.com/g-truc/glm" - description="OpenGL Mathematics (GLM)" - license = "https://github.com/g-truc/glm/blob/manual/copying.txt" + url = "https://github.com/g-truc/glm" + description = "OpenGL Mathematics (GLM)" + license = "The Happy Bunny License (Modified MIT License)" exports_sources = ["FindGLM.cmake", os.sep.join(["..", "..", "glm*"])] exports = "lib_licenses/*" - def build(self): - self.output.info("No compilation necessary for GLM") - def package(self): self.copy("FindGLM.cmake", ".", ".") self.copy("*", src="glm", dst=os.sep.join([".", "include", "glm"])) - self.copy("lib_licenses/license*", dst="licenses", ignore_case=True, keep_path=False) + self.copy("lib_licenses/license*", dst="licenses", ignore_case=True, keep_path=False) diff --git a/util/conan-package/test_package/conanfile.py b/util/conan-package/test_package/conanfile.py index a0a6d2c8..a88b3614 100644 --- a/util/conan-package/test_package/conanfile.py +++ b/util/conan-package/test_package/conanfile.py @@ -7,9 +7,8 @@ class TestGlm(ConanFile): def build(self): cmake = CMake(self) - self.run('cmake "%s" %s' % (self.conanfile_directory, cmake.command_line)) - self.run("cmake --build . %s" % cmake.build_config) + cmake.configure() + cmake.build() def test(self): - self.run(os.sep.join([".","bin", "testGlm"])) - + self.run(os.sep.join([".", "bin", "testGlm"]))