Skip to content
This repository has been archived by the owner on May 2, 2021. It is now read-only.

Commit

Permalink
Cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
Croydon committed Apr 12, 2019
1 parent 8a63b57 commit 41ab6b8
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.11)
cmake_minimum_required(VERSION 2.8.12)
project(cmake_wrapper)

include(conanbuildinfo.cmake)
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
The MIT License (MIT)

Copyright (c) 2016 Malte Haase
Copyright (c) 2017 - 2018 Inexor
Copyright (c) 2017 - 2019 Inexor

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
10 changes: 5 additions & 5 deletions Readme.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![Download](https://api.bintray.com/packages/inexorgame/inexor-conan/grpc%3Ainexorgame/images/download.svg) ](https://bintray.com/inexorgame/inexor-conan/grpc%3Ainexorgame/_latestVersion)
[![Build Status Travis](https://travis-ci.org/inexorgame/conan-grpc.svg?branch=stable%2F1.17.2)](https://travis-ci.org/inexorgame/conan-grpc)
[![Build Status AppVeyor](https://ci.appveyor.com/api/projects/status/github/inexorgame/conan-grpc?branch=stable%2F1.17.2&svg=true)](https://ci.appveyor.com/project/inexorgame/conan-grpc)
[![Build Status Travis](https://travis-ci.org/inexorgame/conan-grpc.svg?branch=stable%2F1.19.1)](https://travis-ci.org/inexorgame/conan-grpc)
[![Build Status AppVeyor](https://ci.appveyor.com/api/projects/status/github/inexorgame/conan-grpc?branch=stable%2F1.19.1&svg=true)](https://ci.appveyor.com/project/inexorgame/conan-grpc)

## Conan package recipe for [*grpc*](https://github.com/grpc/grpc)

Expand All @@ -20,14 +20,14 @@ If you wish to report an issue or make a request for a package, please do so her

### Basic setup

$ conan install grpc/1.17.2@inexorgame/stable
$ conan install grpc/1.19.1@inexorgame/stable

### Project setup

If you handle multiple dependencies in your project is better to add a *conanfile.txt*

[requires]
grpc/1.17.2@inexorgame/stable
grpc/1.19.1@inexorgame/stable

[generators]
cmake
Expand Down Expand Up @@ -65,4 +65,4 @@ The following command both runs all the steps of the conan file, and publishes t
NOTE: The conan recipe license applies only to the files of this recipe, which can be used to build and package grpc.
It does *not* in any way apply or is related to the actual software being packaged.

[MIT](https://github.com/inexorgame/conan-grpc/blob/stable/1.17.2/LICENSE.md)
[MIT](https://github.com/inexorgame/conan-grpc/blob/stable/1.19.1/LICENSE.md)
2 changes: 1 addition & 1 deletion test_package/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.11)
cmake_minimum_required(VERSION 2.8.12)
project(test_package)

set(CMAKE_VERBOSE_MAKEFILE TRUE)
Expand Down
1 change: 0 additions & 1 deletion test_package/conanfile.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4

from conans import ConanFile, CMake
import os
Expand Down

0 comments on commit 41ab6b8

Please sign in to comment.