From e560ce01d4a7da65666237dc7b7fa971dd84b245 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Mon, 7 May 2018 14:28:08 +0200 Subject: [PATCH] Packaging with conan externally #758 --- readme.md | 1 + util/conan-package/.gitignore | 19 ------------------ util/conan-package/FindGLM.cmake | 10 ---------- util/conan-package/README.md | 5 ----- util/conan-package/conanfile.py | 20 ------------------- util/conan-package/lib_licenses/LICENSE1.txt | 11 ---------- util/conan-package/lib_licenses/LICENSE2.txt | 9 --------- .../conan-package/test_package/CMakeLists.txt | 12 ----------- util/conan-package/test_package/conanfile.py | 15 -------------- util/conan-package/test_package/main.cpp | 6 ------ 10 files changed, 1 insertion(+), 107 deletions(-) delete mode 100644 util/conan-package/.gitignore delete mode 100644 util/conan-package/FindGLM.cmake delete mode 100644 util/conan-package/README.md delete mode 100644 util/conan-package/conanfile.py delete mode 100644 util/conan-package/lib_licenses/LICENSE1.txt delete mode 100644 util/conan-package/lib_licenses/LICENSE2.txt delete mode 100644 util/conan-package/test_package/CMakeLists.txt delete mode 100644 util/conan-package/test_package/conanfile.py delete mode 100644 util/conan-package/test_package/main.cpp diff --git a/readme.md b/readme.md index e4660990..c1544426 100644 --- a/readme.md +++ b/readme.md @@ -89,6 +89,7 @@ glm::mat4 camera(float Translate, glm::vec2 const& Rotate) - Added support of -Weverything with Clang #646 - Improved exponential funtion test coverage - Enabled warnings as error with Clang unit tests +- Canan package is an external repository: https://github.com/bincrafters/conan-glm #### Fixes: - Removed doxygen references to GTC_half_float which was removed in 0.9.4 diff --git a/util/conan-package/.gitignore b/util/conan-package/.gitignore deleted file mode 100644 index 85846948..00000000 --- a/util/conan-package/.gitignore +++ /dev/null @@ -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 diff --git a/util/conan-package/FindGLM.cmake b/util/conan-package/FindGLM.cmake deleted file mode 100644 index c1af8d51..00000000 --- a/util/conan-package/FindGLM.cmake +++ /dev/null @@ -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) diff --git a/util/conan-package/README.md b/util/conan-package/README.md deleted file mode 100644 index 1127e2a3..00000000 --- a/util/conan-package/README.md +++ /dev/null @@ -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. diff --git a/util/conan-package/conanfile.py b/util/conan-package/conanfile.py deleted file mode 100644 index d89db047..00000000 --- a/util/conan-package/conanfile.py +++ /dev/null @@ -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) diff --git a/util/conan-package/lib_licenses/LICENSE1.txt b/util/conan-package/lib_licenses/LICENSE1.txt deleted file mode 100644 index aa41c521..00000000 --- a/util/conan-package/lib_licenses/LICENSE1.txt +++ /dev/null @@ -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. diff --git a/util/conan-package/lib_licenses/LICENSE2.txt b/util/conan-package/lib_licenses/LICENSE2.txt deleted file mode 100644 index d639ce8b..00000000 --- a/util/conan-package/lib_licenses/LICENSE2.txt +++ /dev/null @@ -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. diff --git a/util/conan-package/test_package/CMakeLists.txt b/util/conan-package/test_package/CMakeLists.txt deleted file mode 100644 index 7aeab766..00000000 --- a/util/conan-package/test_package/CMakeLists.txt +++ /dev/null @@ -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) - - diff --git a/util/conan-package/test_package/conanfile.py b/util/conan-package/test_package/conanfile.py deleted file mode 100644 index c3d1ca90..00000000 --- a/util/conan-package/test_package/conanfile.py +++ /dev/null @@ -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"])) - diff --git a/util/conan-package/test_package/main.cpp b/util/conan-package/test_package/main.cpp deleted file mode 100644 index 70836fe9..00000000 --- a/util/conan-package/test_package/main.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include "glm/glm.hpp" - -int main (){ - glm::mat4x4 aMatrix; - return 0; -}