diff options
| author | chriseth <c@ethdev.com> | 2015-09-23 04:54:31 +0800 |
|---|---|---|
| committer | chriseth <c@ethdev.com> | 2015-09-23 04:54:31 +0800 |
| commit | 3841d399044f1f09b2bed25b58bf30c0e31441f0 (patch) | |
| tree | a573fc51f781bfc304cba2d59eac4afb25e1c951 | |
| parent | 5ca79f005e265b18d2dc8a9dd37c4c38acb952fd (diff) | |
| parent | 4d82e3165fb0691e6b665efefae4c75585e4559b (diff) | |
| download | dexon-solidity-3841d399044f1f09b2bed25b58bf30c0e31441f0.tar.gz dexon-solidity-3841d399044f1f09b2bed25b58bf30c0e31441f0.tar.zst dexon-solidity-3841d399044f1f09b2bed25b58bf30c0e31441f0.zip | |
Merge pull request #87 from chriseth/fixVersion
Add libevmasm version string.
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libsolidity/Version.cpp | 6 |
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; |