Skip to content

Commit

Permalink
Some version number changes for v0.3 release.
Browse files Browse the repository at this point in the history
  • Loading branch information
kmhofmann committed Jan 19, 2019
1 parent efa18a3 commit c381f5a
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 12 deletions.
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
/build*/
/cmake-build-*/
compile_commands.json
/doc_gen/
CMakeSettings.json
/vcpkg/
/doc_gen/
/package/conan/test_package/build/
/vcpkg/
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.8)
project(selene VERSION 0.2 LANGUAGES CXX)
project(selene VERSION 0.3 LANGUAGES CXX)

# User-settable options
option(SELENE_BUILD_TESTS "Build Selene tests" OFF)
Expand Down
6 changes: 3 additions & 3 deletions docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ used to host the **Selene** package:
conan remote add kmhofmann https://api.bintray.com/conan/kmhofmann/conan-repo

This has to be done once per Conan installation.
Then install the actual package; the current library version provided is `0.2`.
Then install the actual package; the current library version provided is `0.3`.

conan install selene/0.2@selene/testing -r kmhofmann
conan install selene/0.3@selene/testing -r kmhofmann

Alternatively, just specify `selene/0.2@selene/testing` in a project's `conanfile.txt`.
Alternatively, just specify `selene/0.3@selene/testing` in a project's `conanfile.txt`.

Please refer to the [Conan documentation](http://docs.conan.io/) on how to make use of the installed package.
See also the Bintray website for Selene: https://bintray.com/kmhofmann/conan-repo/selene%3Aselene.
19 changes: 13 additions & 6 deletions package/conan/conanfile.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import os
from conans import ConanFile, CMake


class SeleneConan(ConanFile):
name = "selene"
version = "0.2"
version = "0.3"
license = "MIT"
url = "https://github.com/kmhofmann/selene"
description = "A C++17 image representation, processing and I/O library."
Expand All @@ -15,9 +14,9 @@ class SeleneConan(ConanFile):
generators = "cmake"
build_policy = "missing"

requires = ("libjpeg-turbo/[>1.5.0]@bincrafters/stable",
"libpng/[>1.2.0]@bincrafters/stable",
"libtiff/[>4.0.9]@bincrafters/stable")
requires = ("libjpeg-turbo/[>=1.5.0]@bincrafters/stable",
"libpng/[>=1.2.0]@bincrafters/stable",
"libtiff/[>=4.0.9]@bincrafters/stable")

exports_sources = ("../../selene*",
"../../cmake*",
Expand All @@ -35,4 +34,12 @@ def package(self):
self.copy("license*", dst="licenses", ignore_case=True, keep_path=False)

def package_info(self):
self.cpp_info.libs = ["selene_base", "selene_img", "selene_img_io", "selene_img_ops", "selene_io"]
self.cpp_info.libs = ["selene_base",
"selene_base_io",
"selene_img",
"selene_img_io",
"selene_img_io_jpeg",
"selene_img_io_png",
"selene_img_io_tiff",
"selene_img_ops",
"selene_io"]

0 comments on commit c381f5a

Please sign in to comment.