diff --git a/CMakeLists.txt b/CMakeLists.txt index 744eb54..8797591 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ cmake_minimum_required( VERSION 3.5 FATAL_ERROR ) project( variant_lite - VERSION 1.1.0 + VERSION 1.2.0 # DESCRIPTION "A C++17-like variant, a type-safe union for C++98, C++11 and later in a single-file header-only library" # HOMEPAGE_URL "https://github.com/martinmoene/variant-lite" LANGUAGES CXX ) diff --git a/README.md b/README.md index 0074f65..089593f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # variant lite: A single-file header-only version of a C++17-like variant, a type-safe union for C++98, C++11 and later -[![Language](https://img.shields.io/badge/C%2B%2B-98/11/14/17-blue.svg)](https://en.wikipedia.org/wiki/C%2B%2B#Standardization) [![License](https://img.shields.io/badge/license-BSL-blue.svg)](https://opensource.org/licenses/BSL-1.0) [![Build Status](https://travis-ci.org/martinmoene/variant-lite.svg?branch=master)](https://travis-ci.org/martinmoene/variant-lite) [![Build status](https://ci.appveyor.com/api/projects/status/w2dgn3fxyrd6vcq8?svg=true)](https://ci.appveyor.com/project/martinmoene/variant-lite) [![Version](https://badge.fury.io/gh/martinmoene%2Fvariant-lite.svg)](https://github.com/martinmoene/variant-lite/releases) [![Latest download](https://img.shields.io/badge/latest-download-blue.svg)](https://raw.githubusercontent.com/martinmoene/variant-lite/master/include/nonstd/variant.hpp) [![Conan](https://img.shields.io/badge/on-conan-blue.svg)](https://bintray.com/martinmoene/nonstd-lite/variant-lite%3Anonstd-lite/_latestVersion) [![Try it online](https://img.shields.io/badge/on-wandbox-blue.svg)](https://wandbox.org/permlink/TDg24BSSfesvjX3o) +[![Language](https://img.shields.io/badge/C%2B%2B-98/11/14/17-blue.svg)](https://en.wikipedia.org/wiki/C%2B%2B#Standardization) [![License](https://img.shields.io/badge/license-BSL-blue.svg)](https://opensource.org/licenses/BSL-1.0) [![Build Status](https://travis-ci.org/martinmoene/variant-lite.svg?branch=master)](https://travis-ci.org/martinmoene/variant-lite) [![Build status](https://ci.appveyor.com/api/projects/status/w2dgn3fxyrd6vcq8?svg=true)](https://ci.appveyor.com/project/martinmoene/variant-lite) [![Version](https://badge.fury.io/gh/martinmoene%2Fvariant-lite.svg)](https://github.com/martinmoene/variant-lite/releases) [![Latest download](https://img.shields.io/badge/latest-download-blue.svg)](https://raw.githubusercontent.com/martinmoene/variant-lite/master/include/nonstd/variant.hpp) [![Conan](https://img.shields.io/badge/on-conan-blue.svg)](https://bintray.com/martinmoene/nonstd-lite/variant-lite%3Anonstd-lite/_latestVersion) [![Try it online](https://img.shields.io/badge/on-wandbox-blue.svg)](https://wandbox.org/permlink/OyNSGFat1cRbEYxW) **Contents** - [Example usage](#example-usage) diff --git a/conanfile.py b/conanfile.py index 7dedf2c..a387fd2 100644 --- a/conanfile.py +++ b/conanfile.py @@ -1,12 +1,12 @@ -from conans import ConanFile +from conans import ConanFile, CMake class VariantLiteConan(ConanFile): - version = "1.1.0" + version = "1.2.0" name = "variant-lite" description = "A single-file header-only version of a C++17-like variant, a type-safe union for C++98, C++11 and later" license = "Boost Software License - Version 1.0. http://www.boost.org/LICENSE_1_0.txt" url = "https://github.com/martinmoene/variant-lite.git" - exports_sources = "include/nonstd/*", "LICENSE.txt" + exports_sources = "include/nonstd/*", "CMakeLists.txt", "cmake/*", "LICENSE.txt" build_policy = "missing" author = "Martin Moene" @@ -15,8 +15,12 @@ def build(self): pass def package(self): - """Provide pkg/include/nonstd/*.hpp""" - self.copy("*.hpp") + """Run CMake install""" + cmake = CMake(self) + cmake.definitions["VARIANT_LITE__OPT_BUILD_TESTS"] = "OFF" + cmake.definitions["VARIANT_LITE__OPT_BUILD_EXAMPLES"] = "OFF" + cmake.configure() + cmake.install() def package_info(self): self.info.header_only() diff --git a/include/nonstd/variant.hpp b/include/nonstd/variant.hpp index f0e70b9..5e173de 100644 --- a/include/nonstd/variant.hpp +++ b/include/nonstd/variant.hpp @@ -11,7 +11,7 @@ #define NONSTD_VARIANT_LITE_HPP #define variant_lite_MAJOR 1 -#define variant_lite_MINOR 1 +#define variant_lite_MINOR 2 #define variant_lite_PATCH 0 #define variant_lite_VERSION variant_STRINGIFY(variant_lite_MAJOR) "." variant_STRINGIFY(variant_lite_MINOR) "." variant_STRINGIFY(variant_lite_PATCH) diff --git a/project/CodeBlocks/variant-lite.cbp b/project/CodeBlocks/variant-lite.cbp index 04c094c..7b1ea8b 100644 --- a/project/CodeBlocks/variant-lite.cbp +++ b/project/CodeBlocks/variant-lite.cbp @@ -30,6 +30,7 @@ + diff --git a/template/variant.hpp b/template/variant.hpp index aadb7dc..6a0d8bb 100644 --- a/template/variant.hpp +++ b/template/variant.hpp @@ -11,7 +11,7 @@ #define NONSTD_VARIANT_LITE_HPP #define variant_lite_MAJOR 1 -#define variant_lite_MINOR 1 +#define variant_lite_MINOR 2 #define variant_lite_PATCH 0 #define variant_lite_VERSION variant_STRINGIFY(variant_lite_MAJOR) "." variant_STRINGIFY(variant_lite_MINOR) "." variant_STRINGIFY(variant_lite_PATCH) diff --git a/test/t.bat b/test/t.bat index c0e01fb..f7a1f6d 100644 --- a/test/t.bat +++ b/test/t.bat @@ -16,8 +16,8 @@ echo VC%version%: %args% set UCAP=%unit% call :toupper UCAP -set unit_select=-D%unit%_CONFIG_SELECT_%UCAP%=%unit%_%UCAP%_DEFAULT -::set unit_select=-D%unit%_CONFIG_SELECT_%UCAP%=%unit%_%UCAP%_NONSTD +::set unit_select=-D%unit%_CONFIG_SELECT_%UCAP%=%unit%_%UCAP%_DEFAULT +set unit_select=-D%unit%_CONFIG_SELECT_%UCAP%=%unit%_%UCAP%_NONSTD ::set unit_select=-D%unit%_CONFIG_SELECT_%UCAP%=%unit%_%UCAP%_STD set unit_config= diff --git a/test/tg.bat b/test/tg.bat index 8fa5b53..d76e526 100644 --- a/test/tg.bat +++ b/test/tg.bat @@ -19,8 +19,8 @@ echo %gpp% %version%: %std% %args% set UCAP=%unit% call :toupper UCAP -set unit_select=-D%unit%_CONFIG_SELECT_%UCAP%=%unit%_%UCAP%_DEFAULT -::set unit_select=-D%unit%_CONFIG_SELECT_%UCAP%=%unit%_%UCAP%_NONSTD +::set unit_select=-D%unit%_CONFIG_SELECT_%UCAP%=%unit%_%UCAP%_DEFAULT +set unit_select=-D%unit%_CONFIG_SELECT_%UCAP%=%unit%_%UCAP%_NONSTD ::set unit_select=-D%unit%_CONFIG_SELECT_%UCAP%=%unit%_%UCAP%_STD set unit_config=