Packaging with conan externally #758

This commit is contained in:
Christophe Riccio 2018-05-07 14:28:08 +02:00
parent 0daef60d98
commit e560ce01d4
10 changed files with 1 additions and 107 deletions

View File

@ -89,6 +89,7 @@ glm::mat4 camera(float Translate, glm::vec2 const& Rotate)
- Added support of -Weverything with Clang #646 - Added support of -Weverything with Clang #646
- Improved exponential funtion test coverage - Improved exponential funtion test coverage
- Enabled warnings as error with Clang unit tests - Enabled warnings as error with Clang unit tests
- Canan package is an external repository: https://github.com/bincrafters/conan-glm
#### Fixes: #### Fixes:
- Removed doxygen references to GTC_half_float which was removed in 0.9.4 - Removed doxygen references to GTC_half_float which was removed in 0.9.4

View File

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

View File

@ -1,10 +0,0 @@
FIND_PATH(
GLM_INCLUDE_DIR
NAMES
glm
PATHS
include)
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLM REQUIRED_VARS GLM_INCLUDE_DIR)

View File

@ -1,5 +0,0 @@
Conan package for the [GLM](https://github.com/g-truc/glm) library
The package is hosted on [bintray](https://bintray.com/conan/conan-center?filterByPkgName=glm%3Ag-truc).
It works on Windows (Visual Studio or MinGW), MacOS/OSX and Linux.

View File

@ -1,20 +0,0 @@
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_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)

View File

@ -1,11 +0,0 @@
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.

View File

@ -1,9 +0,0 @@
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.

View File

@ -1,12 +0,0 @@
project(GlmTest)
cmake_minimum_required(VERSION 3.0.0)
include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
conan_basic_setup()
if(MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
endif(MSVC)
add_executable(testGlm main.cpp)

View File

@ -1,15 +0,0 @@
from conans import ConanFile, CMake
import os
class TestGlm(ConanFile):
settings = "os", "compiler", "build_type", "arch"
generators = "cmake"
def build(self):
cmake = CMake(self)
cmake.configure()
cmake.build()
def test(self):
self.run(os.sep.join([".","bin", "testGlm"]))

View File

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