From c381f5aa6185d0dcb55b4b360eebbeb6e01de43a Mon Sep 17 00:00:00 2001 From: Michael Hofmann Date: Sat, 19 Jan 2019 14:01:19 +0100 Subject: [PATCH] Some version number changes for v0.3 release. --- .gitignore | 5 +++-- CMakeLists.txt | 2 +- docs/installation.md | 6 +++--- package/conan/conanfile.py | 19 +++++++++++++------ 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index f1372e6..06a44bd 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ /build*/ /cmake-build-*/ compile_commands.json -/doc_gen/ CMakeSettings.json -/vcpkg/ +/doc_gen/ +/package/conan/test_package/build/ +/vcpkg/ \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index b8ebb96..d6d529f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/docs/installation.md b/docs/installation.md index 78d1a14..2957cd1 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -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. \ No newline at end of file diff --git a/package/conan/conanfile.py b/package/conan/conanfile.py index f0c5a96..a6df998 100644 --- a/package/conan/conanfile.py +++ b/package/conan/conanfile.py @@ -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." @@ -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*", @@ -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"]