Merge remote-tracking branch 'ethereum/develop' into sol_barecalls

4 files changed, 22 insertions, 11 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5147ced..0a0b62bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,25 +1,33 @@
 cmake_policy(SET CMP0015 NEW)
+# this policy was introduced in cmake 3.0
+# remove if, once 3.0 will be used on unix
+if (${CMAKE_MAJOR_VERSION} GREATER 2)
+	# old policy do not use MACOSX_RPATH
+	cmake_policy(SET CMP0042 OLD)
+endif()
+set(CMAKE_AUTOMOC OFF)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB")
 
 aux_source_directory(. SRC_LIST)
 
+include_directories(${Boost_INCLUDE_DIRS})
+include_directories(${JSONCPP_INCLUDE_DIRS})
+include_directories(..)
+
 set(EXECUTABLE solidity)
 
 file(GLOB HEADERS "*.h") 
-if(ETH_STATIC)
+
+if (ETH_STATIC)
 	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
 else()
 	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
 endif()
 
-include_directories(..)
-
-target_link_libraries(${EXECUTABLE} evmcore devcore)
-# TODO: Temporary until PR 532 https://github.com/ethereum/cpp-ethereum/pull/532
-# gets accepted. Then we can simply add jsoncpp as a dependency and not the
-# whole of JSONRPC as we are doing right here
-target_link_libraries(${EXECUTABLE} ${JSONRPC_LS})
+target_link_libraries(${EXECUTABLE} ${JSONCPP_LIBRARIES})
+target_link_libraries(${EXECUTABLE} evmcore)
+target_link_libraries(${EXECUTABLE} devcore)
 
 install( TARGETS ${EXECUTABLE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
 install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )
diff --git a/GlobalContext.cpp b/GlobalContext.cpp
index 915d06bf..f4805b1f 100644
--- a/GlobalContext.cpp
+++ b/GlobalContext.cpp
@@ -33,7 +33,7 @@ namespace solidity
 {
 
 GlobalContext::GlobalContext():
-	m_magicVariables{make_shared<MagicVariableDeclaration>("block", make_shared<MagicType>(MagicType::Kind::BLOCK)),
+m_magicVariables(vector<shared_ptr<MagicVariableDeclaration const>>{make_shared<MagicVariableDeclaration>("block", make_shared<MagicType>(MagicType::Kind::BLOCK)),
 					 make_shared<MagicVariableDeclaration>("msg", make_shared<MagicType>(MagicType::Kind::MSG)),
 					 make_shared<MagicVariableDeclaration>("tx", make_shared<MagicType>(MagicType::Kind::TX)),
 					 make_shared<MagicVariableDeclaration>("suicide",
@@ -59,7 +59,7 @@ GlobalContext::GlobalContext():
 					 make_shared<MagicVariableDeclaration>("ripemd160",
 							make_shared<FunctionType>(TypePointers({std::make_shared<IntegerType>(256, IntegerType::Modifier::HASH)}),
 													  TypePointers({std::make_shared<IntegerType>(160, IntegerType::Modifier::HASH)}),
-													  FunctionType::Location::RIPEMD160))}
+													  FunctionType::Location::RIPEMD160))})
 {
 }
 
diff --git a/InterfaceHandler.h b/InterfaceHandler.h
index d71345b9..b1cd4b56 100644
--- a/InterfaceHandler.h
+++ b/InterfaceHandler.h
@@ -28,7 +28,7 @@
 
 #include <string>
 #include <memory>
-#include <jsonrpc/json/json.h>
+#include <jsoncpp/json/json.h>
 
 namespace dev
 {
diff --git a/Token.h b/Token.h
index 51450f1a..22378ae0 100644
--- a/Token.h
+++ b/Token.h
@@ -329,6 +329,9 @@ class Token
 {
 public:
 	// All token values.
+	// attention! msvc issue:
+	// http://stackoverflow.com/questions/9567868/compile-errors-after-adding-v8-to-my-project-c2143-c2059
+	// @todo: avoid TOKEN_LIST macro
 #define T(name, string, precedence) name,
 	enum Value
 	{