Skip to content

Commit

Permalink
Fixed ability to create Conan packages.
Browse files Browse the repository at this point in the history
This was accidentally broken by the changes that picked up generated
version numbers from git.  This change fixes that.
  • Loading branch information
KazDragon committed Apr 28, 2022
1 parent 6f2e144 commit 34b0a18
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class TerminalppConan(ConanFile):
description = "A C++ library for interacting with ANSI terminal windows"
topics = ("terminal-emulators", "ansi-escape-codes")
settings = "os", "compiler", "build_type", "arch"
exports = "*.hpp", "*.in", "*.cpp", "CMakeLists.txt", "*.md", "LICENSE"
exports = "*.hpp", "*.in", "*.cpp", "CMakeLists.txt", "*.md", "LICENSE", "*.cmake"
options = {"shared": [True, False], "coverage": [True, False], "sanitize" : ["off", "address"]}
default_options = {"shared": False, "coverage": False, "sanitize": "off"}
requires = ("fmt/[>=5.3]",
Expand All @@ -26,6 +26,7 @@ def build(self):
cmake.definitions["BUILD_SHARED_LIBS"] = self.options.shared
cmake.definitions["TERMINALPP_COVERAGE"] = self.options.coverage
cmake.definitions["TERMINALPP_SANITIZE"] = self.options.sanitize
cmake.definitions["TERMINALPP_VERSION"] = self.version
cmake.configure()
cmake.build()

Expand Down
2 changes: 1 addition & 1 deletion test_package/example.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ int main()
[](terminalpp::bytes data) {
std::cout << std::string(std::cbegin(data), std::cend(data));
}
}
};

using namespace terminalpp::literals;
terminal << "\\[1SUCCESS!\\x\n"_ets;
Expand Down

0 comments on commit 34b0a18

Please sign in to comment.