Browse Source

checked headless builds with and without jsonrpc

cl-refactor
Marek Kotewicz 10 years ago
parent
commit
46f278cdff
  1. 3
      CMakeLists.txt
  2. 2
      eth/CMakeLists.txt
  3. 1
      libqethereum/CMakeLists.txt
  4. 2
      neth/CMakeLists.txt
  5. 2
      test/CMakeLists.txt
  6. 2
      test/jsonrpc.cpp

3
CMakeLists.txt

@ -150,6 +150,9 @@ if (NOT LANGUAGES)
if ("${TARGET_PLATFORM}" STREQUAL "w64") if ("${TARGET_PLATFORM}" STREQUAL "w64")
cmake_policy(SET CMP0020 NEW) cmake_policy(SET CMP0020 NEW)
endif () endif ()
if (NOT JSONRPC_LS)
message(FATAL_ERROR "Alethzero requires jsonrpc.")
endif()
add_subdirectory(libqethereum) add_subdirectory(libqethereum)
add_subdirectory(alethzero) add_subdirectory(alethzero)

2
eth/CMakeLists.txt

@ -3,8 +3,6 @@ cmake_policy(SET CMP0015 NEW)
aux_source_directory(. SRC_LIST) aux_source_directory(. SRC_LIST)
include_directories(..) include_directories(..)
link_directories(../libethcore)
link_directories(../libwebthree)
set(EXECUTABLE eth) set(EXECUTABLE eth)

1
libqethereum/CMakeLists.txt

@ -50,7 +50,6 @@ if (APPLE)
set(MACOSX_BUNDLE_BUNDLE_NAME ${EXECUTABLE}) set(MACOSX_BUNDLE_BUNDLE_NAME ${EXECUTABLE})
include(BundleUtilities) include(BundleUtilities)
endif () endif ()
file(GLOB HEADERS "*.h") file(GLOB HEADERS "*.h")
if(ETH_STATIC) if(ETH_STATIC)
add_library(${EXECUTABLE} STATIC ${RESOURCE_ADDED} ${SRC_LIST} ${HEADERS}) add_library(${EXECUTABLE} STATIC ${RESOURCE_ADDED} ${SRC_LIST} ${HEADERS})

2
neth/CMakeLists.txt

@ -5,8 +5,6 @@ aux_source_directory(. SRC_LIST)
include_directories(..) include_directories(..)
include_directories(${LEVELDB_ID}) include_directories(${LEVELDB_ID})
link_directories(../libethcore)
link_directories(../libethereum)
set(EXECUTABLE neth) set(EXECUTABLE neth)
add_executable(${EXECUTABLE} ${SRC_LIST}) add_executable(${EXECUTABLE} ${SRC_LIST})

2
test/CMakeLists.txt

@ -4,8 +4,6 @@ aux_source_directory(. SRC_LIST)
list(REMOVE_ITEM SRC_LIST "./createRandomTest.cpp") list(REMOVE_ITEM SRC_LIST "./createRandomTest.cpp")
include_directories(..) include_directories(..)
link_directories(../libethcore)
link_directories(../libethereum)
file(GLOB HEADERS "*.h") file(GLOB HEADERS "*.h")
add_executable(testeth ${SRC_LIST} ${HEADERS}) add_executable(testeth ${SRC_LIST} ${HEADERS})

2
test/jsonrpc.cpp

@ -19,7 +19,7 @@
* @date 2014 * @date 2014
*/ */
#if 1 #if ETH_JSONRPC && 1
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>

Loading…
Cancel
Save