aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchriseth <c@ethdev.com>2015-09-22 18:57:52 +0800
committerchriseth <c@ethdev.com>2015-09-22 22:23:21 +0800
commit4d82e3165fb0691e6b665efefae4c75585e4559b (patch)
tree91bde9e2775638ea9fdfa670ff783c43b9a283ca
parent352c196eb37744b8054909a9801d55c672d0eb1c (diff)
downloaddexon-solidity-4d82e3165fb0691e6b665efefae4c75585e4559b.tar.gz
dexon-solidity-4d82e3165fb0691e6b665efefae4c75585e4559b.tar.zst
dexon-solidity-4d82e3165fb0691e6b665efefae4c75585e4559b.zip
Add libevmasm version string.
-rw-r--r--CMakeLists.txt2
-rw-r--r--libsolidity/Version.cpp6
2 files changed, 5 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 48417d95..06794540 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ include(EthPolicy)
eth_policy()
# project name and version should be set after cmake_policy CMP0048
-set(PROJECT_VERSION "0.1.0")
+set(PROJECT_VERSION "0.1.2")
project(solidity VERSION ${PROJECT_VERSION})
# Let's find our dependencies
diff --git a/libsolidity/Version.cpp b/libsolidity/Version.cpp
index fe140318..c6b5c509 100644
--- a/libsolidity/Version.cpp
+++ b/libsolidity/Version.cpp
@@ -22,6 +22,7 @@
#include <libsolidity/Version.h>
#include <string>
+#include <libevmasm/Version.h>
#include <solidity/BuildInfo.h>
#include <libdevcore/Common.h>
@@ -29,11 +30,12 @@ using namespace dev;
using namespace dev::solidity;
using namespace std;
-char const* dev::solidity::VersionNumber = "0.1.2";
+char const* dev::solidity::VersionNumber = ETH_PROJECT_VERSION;
extern string const dev::solidity::VersionString =
string(dev::solidity::VersionNumber) +
"-" +
string(DEV_QUOTED(ETH_COMMIT_HASH)).substr(0, 8) +
(ETH_CLEAN_REPO ? "" : "*") +
- "/" DEV_QUOTED(ETH_BUILD_TYPE) "-" DEV_QUOTED(ETH_BUILD_PLATFORM);
+ "/" DEV_QUOTED(ETH_BUILD_TYPE) "-" DEV_QUOTED(ETH_BUILD_PLATFORM)
+ " linked to libethereum-" + eth::VersionStringLibEvmAsm;