From c14cb82acd78d366cf2de0263fd473254ad3b032 Mon Sep 17 00:00:00 2001
From: Marek Kotewicz <marek.kotewicz@gmail.com>
Date: Fri, 12 Dec 2014 12:50:57 +0100
Subject: [PATCH] removed LANGUAGES command line option

---
 CMakeLists.txt             | 59 +++++++++++++++++---------------------
 libdevcrypto/TrieDB.cpp    |  4 ---
 libethcore/BlockInfo.cpp   |  4 ---
 libethcore/ProofOfWork.cpp |  3 --
 4 files changed, 26 insertions(+), 44 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d6bf59636..98da62bdc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,6 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 # Normally, set(...CACHE...) creates cache variables, but does not modify them.
 function(createDefaultCacheConfig)
 	set(HEADLESS OFF CACHE BOOL "Do not compile GUI (AlethZero)")
-	set(LANGUAGES OFF CACHE BOOL "Limit build to Serpent/LLL tools")
 	set(VMTRACE OFF CACHE BOOL "VM tracing and run-time checks (useful for cross-implementation VM debugging)")
 	set(PARANOIA OFF CACHE BOOL "Additional run-time checks")
 	set(JSONRPC ON CACHE BOOL "Build with jsonprc. default on")
@@ -24,10 +23,6 @@ endfunction()
 
 # propagates CMake configuration options to the compiler
 function(configureProject)
-	if (LANGUAGES)
-		add_definitions(-DETH_LANGUAGES)
-	endif ()
-
 	if (PARANOIA)
 		if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
 			add_definitions(-DETH_PARANOIA)
@@ -89,7 +84,7 @@ cmake_policy(SET CMP0015 NEW)
 
 createDefaultCacheConfig()
 configureProject()
-message("-- LANGUAGES: ${LANGUAGES}; VMTRACE: ${VMTRACE}; PARANOIA: ${PARANOIA}; HEADLESS: ${HEADLESS}; JSONRPC: ${JSONRPC}")
+message("-- VMTRACE: ${VMTRACE}; PARANOIA: ${PARANOIA}; HEADLESS: ${HEADLESS}; JSONRPC: ${JSONRPC}")
 
 
 # Default TARGET_PLATFORM to "linux".
@@ -125,40 +120,38 @@ if (JSONRPC)
 	add_subdirectory(libweb3jsonrpc)
 endif()
 
-if (NOT LANGUAGES)
-	add_subdirectory(secp256k1)
-	add_subdirectory(libp2p)
-	add_subdirectory(libdevcrypto)
-	add_subdirectory(libwhisper)
+add_subdirectory(secp256k1)
+add_subdirectory(libp2p)
+add_subdirectory(libdevcrypto)
+add_subdirectory(libwhisper)
 
-	add_subdirectory(libethcore)
-	add_subdirectory(libevm)
-	add_subdirectory(libethereum)
+add_subdirectory(libethcore)
+add_subdirectory(libevm)
+add_subdirectory(libethereum)
 
 # TODO is this 'TODO remove' still valid?
 #	add_subdirectory(libethereumx)	 # TODO remove
 
-	add_subdirectory(libwebthree)
-	add_subdirectory(test)
-	add_subdirectory(eth)
-	if("x${CMAKE_BUILD_TYPE}" STREQUAL "xDebug")
-		add_subdirectory(exp)
-	endif ()
+add_subdirectory(libwebthree)
+add_subdirectory(test)
+add_subdirectory(eth)
+if("x${CMAKE_BUILD_TYPE}" STREQUAL "xDebug")
+	add_subdirectory(exp)
+endif ()
 
-	# TODO check msvc
-	if(NOT ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC"))
-		add_subdirectory(neth)
-	endif ()
+# TODO check msvc
+if(NOT ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC"))
+	add_subdirectory(neth)
+endif ()
 
-	if (NOT HEADLESS)
-		
-		add_subdirectory(libjsqrc)
-		add_subdirectory(libqethereum)
-		add_subdirectory(alethzero)
-		add_subdirectory(third)
-		add_subdirectory(mix)
-		
-	endif()
+if (NOT HEADLESS)
+	
+	add_subdirectory(libjsqrc)
+	add_subdirectory(libqethereum)
+	add_subdirectory(alethzero)
+	add_subdirectory(third)
+	add_subdirectory(mix)
+	
 endif()
 
 enable_testing()
diff --git a/libdevcrypto/TrieDB.cpp b/libdevcrypto/TrieDB.cpp
index 674f21aa4..6f476c14b 100644
--- a/libdevcrypto/TrieDB.cpp
+++ b/libdevcrypto/TrieDB.cpp
@@ -24,9 +24,5 @@
 using namespace std;
 using namespace dev;
 
-#if !ETH_LANGUAGES
-
 h256 const dev::c_shaNull = sha3(rlp(""));
 h256 const dev::EmptyTrie = c_shaNull;
-
-#endif
diff --git a/libethcore/BlockInfo.cpp b/libethcore/BlockInfo.cpp
index fbf056867..bf973b565 100644
--- a/libethcore/BlockInfo.cpp
+++ b/libethcore/BlockInfo.cpp
@@ -19,8 +19,6 @@
  * @date 2014
  */
 
-#if !ETH_LANGUAGES
-
 #include <libdevcore/Common.h>
 #include <libdevcore/RLP.h>
 #include <libdevcrypto/TrieDB.h>
@@ -197,5 +195,3 @@ void BlockInfo::verifyParent(BlockInfo const& _parent) const
 			BOOST_THROW_EXCEPTION(InvalidNumber());
 	}
 }
-
-#endif
diff --git a/libethcore/ProofOfWork.cpp b/libethcore/ProofOfWork.cpp
index bfb8942cc..181e379b5 100644
--- a/libethcore/ProofOfWork.cpp
+++ b/libethcore/ProofOfWork.cpp
@@ -19,8 +19,6 @@
  * @date 2014
  */
 
-#if !ETH_LANGUAGES
-
 #include <boost/detail/endian.hpp>
 #include <chrono>
 #include <array>
@@ -107,4 +105,3 @@ h256 DaggerEvaluator::eval(h256 const& _root, h256 const& _nonce)
 
 }
 }
-#endif