diff --git a/util/conan-package/.gitignore b/util/conan-package/.gitignore index d4478c02..85846948 100644 --- a/util/conan-package/.gitignore +++ b/util/conan-package/.gitignore @@ -15,4 +15,5 @@ test_package/build conanfile.pyc conaninfo.txt conanbuildinfo.txt -conanbuildinfo.cmake \ No newline at end of file +conanbuildinfo.cmake +!FindGLM.cmake diff --git a/util/conan-package/FindGLM.cmake b/util/conan-package/FindGLM.cmake new file mode 100644 index 00000000..c1af8d51 --- /dev/null +++ b/util/conan-package/FindGLM.cmake @@ -0,0 +1,10 @@ +FIND_PATH( + GLM_INCLUDE_DIR + NAMES + glm + PATHS + include) + +INCLUDE(FindPackageHandleStandardArgs) + +FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLM REQUIRED_VARS GLM_INCLUDE_DIR) diff --git a/util/conan-package/conanfile.py b/util/conan-package/conanfile.py index 8d609a62..bf81e343 100644 --- a/util/conan-package/conanfile.py +++ b/util/conan-package/conanfile.py @@ -8,11 +8,11 @@ class GlmConan(ConanFile): url="https://github.com/g-truc/glm" description="OpenGL Mathematics (GLM)" license = "https://github.com/g-truc/glm/blob/manual/copying.txt" - exports = ["FindGLM.cmake", "lib_licenses/*", os.sep.join([".", "..", "..", "*"])] + exports_sources = ["FindGLM.cmake", os.sep.join([".", "..", "..", "*"])] + exports = "lib_licenses/*" def build(self): - self.output.warn("No compilation necessary for GLM") - self.output.warn(os.sep.join([".", "..", "..", "*"])) + self.output.info("No compilation necessary for GLM") def package(self): self.copy("FindGLM.cmake", ".", ".") diff --git a/util/conan-package/test_package/conanfile.py b/util/conan-package/test_package/conanfile.py index 7189f150..a0a6d2c8 100644 --- a/util/conan-package/test_package/conanfile.py +++ b/util/conan-package/test_package/conanfile.py @@ -1,12 +1,8 @@ from conans import ConanFile, CMake import os -channel = os.getenv("CONAN_CHANNEL", "testing") -username = os.getenv("CONAN_USERNAME", "g-truc") - class TestGlm(ConanFile): settings = "os", "compiler", "build_type", "arch" - requires = "glm/master@%s/%s" % (username, channel) generators = "cmake" def build(self):