mirror of
https://github.com/g-truc/glm.git
synced 2024-11-25 18:04:34 +00:00
Modifications suggested by conan team.
This commit is contained in:
parent
37857b02fe
commit
bb63aa9e9b
3
util/conan-package/.gitignore
vendored
3
util/conan-package/.gitignore
vendored
@ -15,4 +15,5 @@ test_package/build
|
|||||||
conanfile.pyc
|
conanfile.pyc
|
||||||
conaninfo.txt
|
conaninfo.txt
|
||||||
conanbuildinfo.txt
|
conanbuildinfo.txt
|
||||||
conanbuildinfo.cmake
|
conanbuildinfo.cmake
|
||||||
|
!FindGLM.cmake
|
||||||
|
10
util/conan-package/FindGLM.cmake
Normal file
10
util/conan-package/FindGLM.cmake
Normal file
@ -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)
|
@ -8,11 +8,11 @@ class GlmConan(ConanFile):
|
|||||||
url="https://github.com/g-truc/glm"
|
url="https://github.com/g-truc/glm"
|
||||||
description="OpenGL Mathematics (GLM)"
|
description="OpenGL Mathematics (GLM)"
|
||||||
license = "https://github.com/g-truc/glm/blob/manual/copying.txt"
|
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):
|
def build(self):
|
||||||
self.output.warn("No compilation necessary for GLM")
|
self.output.info("No compilation necessary for GLM")
|
||||||
self.output.warn(os.sep.join([".", "..", "..", "*"]))
|
|
||||||
|
|
||||||
def package(self):
|
def package(self):
|
||||||
self.copy("FindGLM.cmake", ".", ".")
|
self.copy("FindGLM.cmake", ".", ".")
|
||||||
|
@ -1,12 +1,8 @@
|
|||||||
from conans import ConanFile, CMake
|
from conans import ConanFile, CMake
|
||||||
import os
|
import os
|
||||||
|
|
||||||
channel = os.getenv("CONAN_CHANNEL", "testing")
|
|
||||||
username = os.getenv("CONAN_USERNAME", "g-truc")
|
|
||||||
|
|
||||||
class TestGlm(ConanFile):
|
class TestGlm(ConanFile):
|
||||||
settings = "os", "compiler", "build_type", "arch"
|
settings = "os", "compiler", "build_type", "arch"
|
||||||
requires = "glm/master@%s/%s" % (username, channel)
|
|
||||||
generators = "cmake"
|
generators = "cmake"
|
||||||
|
|
||||||
def build(self):
|
def build(self):
|
||||||
|
Loading…
Reference in New Issue
Block a user