8000 Added conan packaging configuration. · Pull Request #643 · g-truc/glm · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Added conan packaging configuration. #643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from Jun 24, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions util/conan-package/.gitignore
Original file line number Diff line number Diff line change
@@ -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
8 changes: 8 additions & 0 deletions util/conan-package/README.md
Original file line number Diff line number Diff line change
@@ -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.

20 changes: 20 additions & 0 deletions util/conan-package/conanfile.py
Original file line number Diff line number Diff line change
@@ -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([".", "..", "..", "*"])]

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You might take advantage of the exports_sources functionality to store the sources and the .cmake file. I would only keep the license as exports. It is much more efficient to use exports_sources for source code.


def build(self):
self.output.warn("No compilation necessary for GLM")
self.output.warn(os.sep.join([".", "..", "..", "*"]))

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the purpose of the second warning? I would remove it, and maybe change the first one for a output.info() message, as it is not something that should concern the user.


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)
11 changes: 11 additions & 0 deletions util/conan-package/lib_licenses/LICENSE1.txt
Original file line number Diff line number Diff line change
@@ -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.
9 changes: 9 additions & 0 deletions util/conan-package/lib_licenses/LICENSE2.txt
Original file line number Diff line number Diff line change
@@ -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.
13 changes: 13 additions & 0 deletions util/conan-package/test_package/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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}")
19 changes: 19 additions & 0 deletions util/conan-package/test_package/conanfile.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
from conans import ConanFile, CMake
import os

channel = os.getenv("CONAN_CHANNEL", "testing")

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From conan 0.25 you can simplify this test_package recipe, removing the user/channel, and also the requires, so it is not necessary to change them or change versions when testing a different one. Then, use conan create user/channel better.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the feedback! I have implemented the changes and introduced a pull request: #662

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"]))

6 changes: 6 additions & 0 deletions util/conan-package/test_package/main.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#include "glm/glm.hpp"

int main (){
glm::mat4x4 aMatrix;
return 0;
}
0