From 995062279c30cd3083df70e93be85c83ed7542dc Mon Sep 17 00:00:00 2001 From: Tim Hughes Date: Mon, 24 Feb 2014 10:09:54 +0000 Subject: [PATCH] Move ETH_VERSION to Common.h (for now) so it's picked up on MSVC. --- CMakeLists.txt | 1 - libethereum/Common.h | 3 +++ windows/LibEthereum.props | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ad99edc4..7359c94c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,6 @@ set(CMAKE_AUTOMOC ON) cmake_policy(SET CMP0015 NEW) -set(ETH_VERSION 0.3.7) set(ETH_BUILD_TYPE ${CMAKE_BUILD_TYPE}) # Default HEADLESS to 0. diff --git a/libethereum/Common.h b/libethereum/Common.h index 8f834100a..efdf825db 100644 --- a/libethereum/Common.h +++ b/libethereum/Common.h @@ -23,6 +23,9 @@ #pragma once +// define version +#define ETH_VERSION 0.3.7 + // way to many uint to size_t warnings in 32 bit build #ifdef _M_IX86 #pragma warning(disable:4244) diff --git a/windows/LibEthereum.props b/windows/LibEthereum.props index 87dd41533..b8c79c9fd 100644 --- a/windows/LibEthereum.props +++ b/windows/LibEthereum.props @@ -15,7 +15,7 @@ true false include/$(ProjectName);../libethereum;$(BoostDir);../../leveldb/include;../../cryptopp;../secp256k1;../../miniupnp - ETH_VERSION=0.3.3;ETH_BUILD_PLATFORM=Windows/VS2013;ETH_BUILD_TYPE=$(Configuration)-$(Platform);STATICLIB;LEVELDB_PLATFORM_WINDOWS;USE_NUM_BOOST;USE_FIELD_10X26;USE_FIELD_INV_BUILTIN;_WIN32_WINNT=0x0501;WIN32;%(PreprocessorDefinitions) + ETH_BUILD_PLATFORM=Windows/VS2013;ETH_BUILD_TYPE=$(Configuration)-$(Platform);STATICLIB;LEVELDB_PLATFORM_WINDOWS;USE_NUM_BOOST;USE_FIELD_10X26;USE_FIELD_INV_BUILTIN;_WIN32_WINNT=0x0501;WIN32;%(PreprocessorDefinitions) true true