diff --git a/CMakeLists.txt b/CMakeLists.txt index a2d3a830..f5ba09ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,12 +17,6 @@ if(NOT MSVC) option(COVERAGE "Generate coverage data using gcov" OFF) endif() -if(STATIC) - set(ZLIB_LIBRARY libz.a) - set(CRYPTOPP_LIBRARY libcryptopp.a) - set(EXPAT_LIBRARY libexpat.a) -endif() - # Add components according to selected options if(SAMPLES) add_subdirectory(samples) diff --git a/include/xlnt/cell/rich_text_run.hpp b/include/xlnt/cell/rich_text_run.hpp index 47e954ef..432097e0 100644 --- a/include/xlnt/cell/rich_text_run.hpp +++ b/include/xlnt/cell/rich_text_run.hpp @@ -39,15 +39,9 @@ struct rich_text_run std::string first; optional second; - bool operator==(const rich_text_run &other) const - { - return first == other.first && second == other.second; - } + bool operator==(const rich_text_run &other) const; - bool operator!=(const rich_text_run &other) const - { - return !(*this == other); - } + bool operator!=(const rich_text_run &other) const; }; } // namespace xlnt diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 563cfe96..2ccc82e0 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.2) -project(xlnt VERSION 0.9.4) +project(xlnt VERSION 0.9.5) set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) diff --git a/source/cell/rich_text_run.cpp b/source/cell/rich_text_run.cpp index 5a6c3d3a..79b2456d 100644 --- a/source/cell/rich_text_run.cpp +++ b/source/cell/rich_text_run.cpp @@ -25,4 +25,14 @@ namespace xlnt { +bool rich_text_run::operator==(const rich_text_run &other) const +{ + return first == other.first && second == other.second; +} + +bool rich_text_run::operator!=(const rich_text_run &other) const +{ + return !(*this == other); +} + } // namespace xlnt