Merge pull request #87 from chriseth/fixVersion

Add libevmasm version string.
This commit is contained in:
chriseth 2015-09-22 22:54:31 +02:00
commit 3841d39904
2 changed files with 5 additions and 3 deletions

View File

@ -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

View File

@ -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;