CMake: drop GUI option

CMakeLists.txt

@@ -36,7 +36,6 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 #defaults:
 set(D_CMAKE_BUILD_TYPE "Release")
-set(D_GUI ON)
 set(D_ETHASHCL ON)
 set(D_ETHASHCUDA OFF)
 set(D_JSONRPC ON)
@@ -47,41 +46,6 @@ set(D_OLYMPIC OFF)
 set(D_MINER ON)
 set(D_ETHSTRATUM OFF)
 
-if (BUNDLE STREQUAL "minimal")
-	set(D_GUI OFF)
-elseif (BUNDLE STREQUAL "full")
-	set(D_GUI ON)
-elseif (BUNDLE STREQUAL "cli")
-	set(D_GUI OFF)
-elseif (BUNDLE STREQUAL "core")
-	set(D_GUI ON)
-elseif (BUNDLE STREQUAL "user")
-	set(D_GUI ON)
-elseif (BUNDLE STREQUAL "wallet")
-	set(D_GUI OFF)
-	set(D_MINER OFF)
-	set(D_ETHASHCL OFF)
-	set(D_JSONRPC OFF)
-elseif (BUNDLE STREQUAL "miner")
-	set(D_GUI OFF)
-	set(D_MINER ON)
-	set(D_ETHASHCL ON)
-	set(D_JSONRPC ON)
-	set(D_ETHSTRATUM ON)
-elseif (BUNDLE STREQUAL "cudaminer")
-	set(D_GUI OFF)
-	set(D_MINER ON)
-	set(D_ETHASHCL ON)
-	set(D_ETHASHCUDA ON)
-	set(D_JSONRPC ON)
-	set(D_ETHSTRATUM ON)
-elseif (BUNDLE STREQUAL "release")      # release builds
-	set(D_GUI ON)
-	set(D_ETHASHCL ON)
-	set(D_JSONRPC ON)
-	set(D_CMAKE_BUILD_TYPE "Release")
-endif ()
-
 if ("${CMAKE_BUILD_TYPE}" STREQUAL "")
 	set(CMAKE_BUILD_TYPE ${D_CMAKE_BUILD_TYPE})
 endif ()
@@ -223,7 +187,6 @@ eth_format_option(VMTRACE)
 eth_format_option(JSONRPC)
 eth_format_option(MINER)
 eth_format_option(PROFILING)
-eth_format_option(GUI)
 eth_format_option(ETHASHCL)
 eth_format_option(ETHASHCUDA)
 eth_format_option(OLYMPIC)
@@ -251,7 +214,6 @@ message("-----------------------------------------------------------------------
 message("--                  CMake Version                            ${CMAKE_VERSION}")
 message("-- CMAKE_BUILD_TYPE Build type                               ${CMAKE_BUILD_TYPE}")
 message("-- TARGET_PLATFORM  Target platform                          ${TARGET_PLATFORM}")
-message("-- BUNDLE           Build bundle                             ${BUNDLE}")
 message("--------------------------------------------------------------- features")
 message("--                  Chromium support                         ${ETH_HAVE_WEBENGINE}")
 message("--                  Hardware identification support          ${CPUID_FOUND}")
@@ -263,7 +225,6 @@ message("-- JSONRPC          JSON-RPC support                         ${JSONRPC}
 message("-- OLYMPIC          Default to the Olympic network           ${OLYMPIC}")
 message("------------------------------------------------------------- components")
 message("-- MINER            Build miner                              ${MINER}")
-message("-- GUI              Build GUI components                     ${GUI}")
 message("-- ETHASHCL         Build OpenCL components                  ${ETHASHCL}")
 message("-- ETHASHCUDA       Build CUDA components                    ${ETHASHCUDA}")
 message("-- ETHSTRATUM       Build Stratum components                 ${ETHSTRATUM}")

cmake/EthDependencies.cmake

@@ -125,47 +125,6 @@ endif()
 find_program(ETH_JSON_RPC_STUB jsonrpcstub)
 message(" - jsonrpcstub location    : ${ETH_JSON_RPC_STUB}")
 
-# do not compile GUI
-if (GUI)
-
-# we need json rpc to build alethzero
-	if (NOT JSON_RPC_CPP_FOUND)
-		message (FATAL_ERROR "JSONRPC is required for GUI client")
-	endif()
-
-# find all of the Qt packages
-# remember to use 'Qt' instead of 'QT', cause unix is case sensitive
-# TODO make headless client optional
-
-	set (ETH_QT_VERSION 5.4)
-
-	find_package (Qt5Core ${ETH_QT_VERSION} REQUIRED)
-	find_package (Qt5Gui ${ETH_QT_VERSION} REQUIRED)
-	find_package (Qt5Quick ${ETH_QT_VERSION} REQUIRED)
-	find_package (Qt5Qml ${ETH_QT_VERSION} REQUIRED)
-	find_package (Qt5Network ${ETH_QT_VERSION} REQUIRED)
-	find_package (Qt5Widgets ${ETH_QT_VERSION} REQUIRED)
-	find_package (Qt5WebEngine ${ETH_QT_VERSION} REQUIRED)
-	find_package (Qt5WebEngineWidgets ${ETH_QT_VERSION} REQUIRED)
-
-	# we need to find path to macdeployqt on mac
-	if (APPLE)
-		set (MACDEPLOYQT_APP ${Qt5Core_DIR}/../../../bin/macdeployqt)
-		message(" - macdeployqt path: ${MACDEPLOYQT_APP}")
-	endif()
-	# we need to find path to windeployqt on windows
-	if (WIN32)
-		set (WINDEPLOYQT_APP ${Qt5Core_DIR}/../../../bin/windeployqt)
-		message(" - windeployqt path: ${WINDEPLOYQT_APP}")
-	endif()
-
-	if (APPLE)
-		find_program(ETH_APP_DMG appdmg)
-		message(" - appdmg location : ${ETH_APP_DMG}")
-	endif()
-
-endif() #GUI
-
 # use multithreaded boost libraries, with -mt suffix
 set(Boost_USE_MULTITHREADED ON)
 

libethcore/CMakeLists.txt

@@ -20,7 +20,7 @@ file(GLOB HEADERS "*.h")
 
 add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
 
-target_link_libraries(${EXECUTABLE} ethash)
+target_link_libraries(${EXECUTABLE} ethash pthread)
 
 if (ETHASHCL)
 	target_link_libraries(${EXECUTABLE} ethash-cl)

libstratum/CMakeLists.txt

@@ -9,7 +9,7 @@ include_directories(${JSONCPP_INCLUDE_DIRS})
 file(GLOB HEADERS "*.h")
 
 add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
-target_link_libraries(${EXECUTABLE} ${Boost_SYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY} ${Boost_REGEX_LIBRARY}) 
+target_link_libraries(${EXECUTABLE} ${Boost_SYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY} ${Boost_REGEX_LIBRARY} pthread) 
 
 install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
-install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )
+install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )