Merge pull request #643 from dimi309/master

Added conan packaging configuration. #643 #641

util/conan-package/.gitignore

@@ -0,0 +1,18 @@
+#Backup files
+*\~
+*swp
+
+#OSX
+Thumbs.db
+.DS_Store
+
+#Emacs buffers
+\#*\#
+\.#*
+
+#Conan
+test_package/build
+conanfile.pyc
+conaninfo.txt
+conanbuildinfo.txt
+conanbuildinfo.cmake

util/conan-package/README.md

@@ -0,0 +1,8 @@
+Conan package for the [GLM](https://github.com/g-truc/glm) library
+
+The package is hosted on [bintray](https://bintray.com/dimi309/conan-packages/glm%3Ag-truc). Until it gets accepted to the conan-center repository, in order to use it, you need to add this repository as a remote to your conan installation:
+
+	conan remote add bintraydimi309 https://api.bintray.com/conan/dimi309/conan-packages
+
+It works on Windows (Visual Studio or MinGW), MacOS/OSX and Linux.
+

util/conan-package/conanfile.py

@@ -0,0 +1,20 @@
+import os
+from conans import ConanFile
+
+class GlmConan(ConanFile):
+    name = "glm"
+    version = "master"
+    generators = "txt"
+    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([".", "..", "..", "*"])]
+
+    def build(self):
+        self.output.warn("No compilation necessary for GLM")
+        self.output.warn(os.sep.join([".", "..", "..", "*"]))
+
+    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)

util/conan-package/lib_licenses/LICENSE1.txt

@@ -0,0 +1,11 @@
+The Happy Bunny License (Modified MIT License)
+
+Copyright (c) 2005 - 2017 G-Truc Creation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+Restrictions: By making use of the Software for military purposes, you choose to make a Bunny unhappy.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

util/conan-package/lib_licenses/LICENSE2.txt

@@ -0,0 +1,9 @@
+The MIT License
+
+Copyright (c) 2005 - 2017 G-Truc Creation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

util/conan-package/test_package/CMakeLists.txt

@@ -0,0 +1,13 @@
+project(GlmTest)
+cmake_minimum_required(VERSION 3.0.0)
+include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
+conan_basic_setup()
+
+set(CMAKE_C_FLAGS "${CONAN_C_FLAGS}")
+set(CMAKE_CXX_FLAGS "${CONAN_CXX_FLAGS}")
+set(CMAKE_SHARED_LINKER_FLAGS "${CONAN_SHARED_LINKER_FLAGS}")
+
+add_executable(testGlm main.cpp)
+TARGET_COMPILE_DEFINITIONS(testGlm PUBLIC "${CONAN_DEFINES}")
+TARGET_LINK_LIBRARIES(testGlm PUBLIC "${CONAN_LIBS}")
+SET_TARGET_PROPERTIES(testGlm PROPERTIES LINK_FLAGS "${CONAN_EXE_LINKER_FLAGS}")

util/conan-package/test_package/conanfile.py

@@ -0,0 +1,19 @@
+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):
+        cmake = CMake(self)
+        self.run('cmake "%s" %s' % (self.conanfile_directory, cmake.command_line))
+        self.run("cmake --build . %s" % cmake.build_config)
+
+    def test(self):
+        self.run(os.sep.join([".","bin", "testGlm"]))
+

util/conan-package/test_package/main.cpp

@@ -0,0 +1,6 @@
+#include "glm/glm.hpp"
+
+int main (){
+  glm::mat4x4 aMatrix;
+  return 0;
+}