From a0ceff1a5c7b310cdefb018468c86c3b87ae9dfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20=C5=81oskot?= Date: Wed, 6 Nov 2019 21:57:58 +0100 Subject: [PATCH] Remove include/boost/gil/version.hpp file as unused Motivation: - GIL is part of Boost collection, so Boost version is sufficient - GIL version makes little sense unless GIL becomes independent - Two distinct version numbers, Boost's and GIL's, are confusing. - Role of GIL's version number is not documented thus not entirely clear The removal was discussed and agreed upon in this thread https://lists.boost.org/boost-gil/2019/11/0346.php --- CMakeLists.txt | 16 ---------------- include/boost/gil.hpp | 1 - include/boost/gil/version.hpp | 22 ---------------------- 3 files changed, 39 deletions(-) delete mode 100644 include/boost/gil/version.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 5a930b15cb..2e79b90bd7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,29 +25,13 @@ option(GIL_USE_CONAN "Use Conan to install dependencies" OFF) option(GIL_USE_CLANG_TIDY "Set CMAKE_CXX_CLANG_TIDY property on targets to enable clang-tidy linting" OFF) set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ standard version to use (default is 11)") -#----------------------------------------------------------------------------- -# Version -#----------------------------------------------------------------------------- -file(STRINGS include/boost/gil/version.hpp - BOOST_GIL_LIB_VERSION - REGEX "#define BOOST_GIL_LIB_VERSION ") - -if(BOOST_GIL_LIB_VERSION) - string(REGEX REPLACE ".*\"(.*)\".*" "\\1" BOOST_GIL_LIB_VERSION "${BOOST_GIL_LIB_VERSION}") - string(REPLACE "_" "." BOOST_GIL_LIB_VERSION "${BOOST_GIL_LIB_VERSION}") -else() - message(SEND_ERROR "Cannot find version in '${CMAKE_CURRENT_SOURCE_DIR}/include/boost/gil/version.hpp'") -endif() - #----------------------------------------------------------------------------- # Project #----------------------------------------------------------------------------- project(Boost.GIL LANGUAGES CXX - VERSION ${BOOST_GIL_LIB_VERSION} DESCRIPTION "Boost.GIL - Generic Image Library | Requires C++11 since Boost 1.68") -message(STATUS "Boost.GIL: Version ${PROJECT_VERSION}") list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_BINARY_DIR}/cmake) #----------------------------------------------------------------------------- diff --git a/include/boost/gil.hpp b/include/boost/gil.hpp index 8c338b0a7e..5fc7d15819 100644 --- a/include/boost/gil.hpp +++ b/include/boost/gil.hpp @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include diff --git a/include/boost/gil/version.hpp b/include/boost/gil/version.hpp deleted file mode 100644 index 5fd5a51577..0000000000 --- a/include/boost/gil/version.hpp +++ /dev/null @@ -1,22 +0,0 @@ -// -// Copyright (c) 2018 Christian Henning (chhenning at gmail dot com) -// -// Distributed under the Boost Software License, Version 1.0 -// See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt -// -#ifndef BOOST_GIL_VERSION_HPP -#define BOOST_GIL_VERSION_HPP - -/// @def BOOST_GIL_API_VERSION -/// Identifies the API version of gil. -/// This is a simple integer that is incremented by one every -/// time a set of code changes is merged to the develop branch. -#define BOOST_GIL_VERSION 22 - -// BOOST_GIL_LIB_VERSION must be defined to be the same as BOOST_GIL_VERSION -// but as a *string* in the form "x_y[_z]" where x is the major version -// number, y is the minor version number, and z is the patch level if not 0. -#define BOOST_GIL_LIB_VERSION "2_2" - -#endif