fixed styling issues

cmake/FindJsonRpcCpp.cmake

@@ -38,7 +38,6 @@ find_library(
 # message (" - json-rcp-cpp header : ${JSON_RPC_CPP_INCLUDE_DIRS}")
 # message (" - json-rcp-cpp lib    : ${JSON_RPC_CPP_LIBRARIES}")
 
-
 # handle the QUIETLY and REQUIRED arguments and set JSON_RPC_CPP_FOUND to TRUE
 # if all listed variables are TRUE, hide their existence from configuration view
 include(FindPackageHandleStandardArgs)

eth/CMakeLists.txt

@@ -21,14 +21,14 @@ if(MINIUPNPC_FOUND)
 	target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LIBRARY})
 endif()
 
-if(JSON_RPC_CPP_FOUND)
-    target_link_libraries(${EXECUTABLE} web3jsonrpc)
-endif()
-
 if (READLINE_FOUND)
 	target_link_libraries(${EXECUTABLE} ${READLINE_LIBRARY})
 endif()
 
+if (JSONRPC)
+	target_link_libraries(${EXECUTABLE} web3jsonrpc)
+endif()
+
 target_link_libraries(${EXECUTABLE} webthree)
 target_link_libraries(${EXECUTABLE} secp256k1)
 

extdep/compile/curl.cmake

@@ -27,4 +27,3 @@ ExternalProject_Add(curl
 
 endif()
 
-

extdep/compile/icu.cmake

@@ -1,6 +1,5 @@
 if (APPLE)
 
-# patch for VS2013 and Windows Qt build
 elseif (WIN32)
 	ExternalProject_Add(icu
 		GIT_REPOSITORY https://github.com/debris/icu-win32.git
@@ -8,7 +7,6 @@ ExternalProject_Add(icu
 		BINARY_DIR icu-prefix/src/icu
 		CONFIGURE_COMMAND ""
 		BUILD_COMMAND ""
-	#INSTALL_COMMAND cmd /c cp lib/* ${ETH_DEPENDENCY_INSTALL_DIR}/lib && cp -R include/uni ${ETH_DEPENDENCY_INSTALL_DIR}/include && cp bin/* ${ETH_DEPENDENCY_INSTALL_DIR}/bin
 		INSTALL_COMMAND cmake -E copy_directory . ${ETH_DEPENDENCY_INSTALL_DIR}
 	)
 

extdep/compile/jom.cmake

@@ -2,7 +2,6 @@ if(APPLE)
 
 
 elseif (WIN32)
-# nmake is not working for qt on windows, do not know why
 	ExternalProject_Add(jom
 		URL http://download.qt-project.org/official_releases/jom/jom.zip
 		BINARY_DIR jom-prefix/src/jom
@@ -15,4 +14,3 @@ else()
 
 endif()
 
-

extdep/compile/jsoncpp.cmake

@@ -11,5 +11,6 @@ ExternalProject_Add(jsoncpp
 		BUILD_COMMAND devenv jsoncpp.sln /build release
 		INSTALL_COMMAND cmd /c cp lib/Release/jsoncpp.lib ${ETH_DEPENDENCY_INSTALL_DIR}/lib && cp -R include/json ${ETH_DEPENDENCY_INSTALL_DIR}/include/jsoncpp
 	)
+
 else()
 endif()

extdep/miniupnpc.cmake

@@ -1,3 +1,4 @@
+# TODO this file is not used yet, but will be in future
 include(ExternalProject)
 
 ExternalProject_Add(miniupnpc
@@ -8,4 +9,3 @@ ExternalProject_Add(miniupnpc
 	INSTALL_COMMAND make install INSTALLPREFIX=${ETH_DEPENDENCY_INSTALL_DIR}
 )
 
-

libethereumx/CMakeLists.txt

@@ -8,15 +8,14 @@ include_directories(..)
 
 set(EXECUTABLE ethereumx)
 
+file(GLOB HEADERS "*.h") 
+
 if (ETH_STATIC)
-	add_library(${EXECUTABLE} STATIC ${SRC_LIST})
+	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
 else()
-	add_library(${EXECUTABLE} SHARED ${SRC_LIST})
+	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
 endif()
 
-file(GLOB HEADERS "*.h") 
-
-
 target_link_libraries(${EXECUTABLE} ${LEVELDB_LS})
 target_link_libraries(${EXECUTABLE} ${CRYPTOPP_LS})
 
@@ -29,24 +28,6 @@ target_link_libraries(${EXECUTABLE} evm)
 target_link_libraries(${EXECUTABLE} lll)
 target_link_libraries(${EXECUTABLE} ethcore)
 target_link_libraries(${EXECUTABLE} secp256k1)
-target_link_libraries(${EXECUTABLE} gmp)
-
-if (APPLE)
-	# Latest mavericks boost libraries only come with -mt
-	target_link_libraries(${EXECUTABLE} boost_system-mt)
-	target_link_libraries(${EXECUTABLE} boost_regex-mt)
-	target_link_libraries(${EXECUTABLE} boost_filesystem-mt)
-	target_link_libraries(${EXECUTABLE} boost_thread-mt)
-	find_package(Threads REQUIRED)
-	target_link_libraries(${EXECUTABLE} ${CMAKE_THREAD_LIBS_INIT})
-elseif (UNIX)
-	target_link_libraries(${EXECUTABLE} ${Boost_SYSTEM_LIBRARY})
-	target_link_libraries(${EXECUTABLE} ${Boost_REGEX_LIBRARY})
-	target_link_libraries(${EXECUTABLE} ${Boost_FILESYSTEM_LIBRARY})
-	target_link_libraries(${EXECUTABLE} ${Boost_THREAD_LIBRARY})
-	target_link_libraries(${EXECUTABLE} ${Boost_DATE_TIME_LIBRARY})
-	target_link_libraries(${EXECUTABLE} ${CMAKE_THREAD_LIBS_INIT})
-endif ()
 
 install( TARGETS ${EXECUTABLE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
 install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )

libevm/CMakeLists.txt

@@ -17,6 +17,7 @@ include_directories(${LEVELDB_INCLUDE_DIR})
 set(EXECUTABLE evm)
 
 file(GLOB HEADERS "*.h")
+
 if (ETH_STATIC)
 	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
 else()

libevmcore/CMakeLists.txt

@@ -17,6 +17,7 @@ include_directories(..)
 set(EXECUTABLE evmcore)
 
 file(GLOB HEADERS "*.h")
+
 if (ETH_STATIC)
 	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
 else()

libjsqrc/CMakeLists.txt

@@ -10,6 +10,6 @@ set(CMAKE_AUTOMOC OFF)
 
 qt5_add_resources(JSQRC js.qrc)
 add_library(jsqrc STATIC ${JSQRC})
-qt5_use_modules(jsqrc Core)
+target_link_libraries(jsqrc Qt5::Core)
 
 install( TARGETS jsqrc ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )

liblll/CMakeLists.txt

@@ -17,6 +17,7 @@ include_directories(..)
 set(EXECUTABLE lll)
 
 file(GLOB HEADERS "*.h")
+
 if(ETH_STATIC)
 	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
 else()

libp2p/CMakeLists.txt

@@ -17,6 +17,7 @@ include_directories(${LEVELDB_INCLUDE_DIR})
 set(EXECUTABLE p2p)
 
 file(GLOB HEADERS "*.h")
+
 if(ETH_STATIC)
 	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
 else()
@@ -24,6 +25,7 @@ else()
 endif()
 
 target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARY})
+
 if(MINIUPNPC_FOUND)
 	target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LIBRARY})
 endif()

libpyserpent/CMakeLists.txt

@@ -4,11 +4,11 @@ aux_source_directory(. SRC_LIST)
 
 set(EXECUTABLE pyserpent)
 
-# set(CMAKE_INSTALL_PREFIX ../lib)
-add_library(${EXECUTABLE} SHARED ${SRC_LIST})
-
 file(GLOB HEADERS "*.h") 
 
+# set(CMAKE_INSTALL_PREFIX ../lib)
+add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
+
 include_directories(..)
 
 target_link_libraries(${EXECUTABLE} serpent)
@@ -17,26 +17,6 @@ target_link_libraries(${EXECUTABLE} evmcore)
 target_link_libraries(${EXECUTABLE} devcore)
 target_link_libraries(${EXECUTABLE} ${PYTHON_LS})
 
-if("${TARGET_PLATFORM}" STREQUAL "w64")
-	target_link_libraries(${EXECUTABLE} boost_thread_win32-mt-s)
-	target_link_libraries(${EXECUTABLE} iphlpapi)
-	target_link_libraries(${EXECUTABLE} ws2_32)
-	target_link_libraries(${EXECUTABLE} mswsock)
-	target_link_libraries(${EXECUTABLE} shlwapi)
-elseif (APPLE)
-	# Latest mavericks boost libraries only come with -mt
-	target_link_libraries(${EXECUTABLE} boost_thread-mt)
-	find_package(Threads REQUIRED)
-	target_link_libraries(${EXECUTABLE} ${CMAKE_THREAD_LIBS_INIT})
-elseif (UNIX)
-	target_link_libraries(${EXECUTABLE} ${Boost_THREAD_LIBRARY})
-	target_link_libraries(${EXECUTABLE} ${CMAKE_THREAD_LIBS_INIT})
-else ()
-	target_link_libraries(${EXECUTABLE} boost_thread)
-	find_package(Threads REQUIRED)
-	target_link_libraries(${EXECUTABLE} ${CMAKE_THREAD_LIBS_INIT})
-endif ()
-
 install( TARGETS ${EXECUTABLE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
 install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )
 

libqethereum/CMakeLists.txt

@@ -12,8 +12,8 @@ endif()
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 aux_source_directory(. SRC_LIST)
 
-include_directories(..)
 include_directories(${JSON_RPC_CPP_INCLUDE_DIRS})
+include_directories(..)
 
 set(EXECUTABLE qethereum)
 
@@ -25,11 +25,18 @@ else()
 	add_library(${EXECUTABLE} SHARED ${RESOURCE_ADDED} ${SRC_LIST} ${HEADERS})
 endif()
 
-qt5_use_modules(${EXECUTABLE} Core Gui WebKit WebKitWidgets Widgets Network Quick Qml)
-target_link_libraries(${EXECUTABLE} ethereum)
-target_link_libraries(${EXECUTABLE} secp256k1)
+target_link_libraries(${EXECUTABLE} Qt5::Core)
+target_link_libraries(${EXECUTABLE} Qt5::Gui)
+target_link_libraries(${EXECUTABLE} Qt5::WebKit)
+target_link_libraries(${EXECUTABLE} Qt5::WebKitWidgets)
+target_link_libraries(${EXECUTABLE} Qt5::Widgets)
+target_link_libraries(${EXECUTABLE} Qt5::Network)
+target_link_libraries(${EXECUTABLE} Qt5::Quick)
+target_link_libraries(${EXECUTABLE} Qt5::Qml)
 target_link_libraries(${EXECUTABLE} ${JSON_RPC_CPP_COMMON_LIBRARY})
 target_link_libraries(${EXECUTABLE} ${JSON_RPC_CPP_SERVER_LIBRARY})
+target_link_libraries(${EXECUTABLE} ethereum)
+target_link_libraries(${EXECUTABLE} secp256k1)
 
 install( TARGETS ${EXECUTABLE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
 install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )

libserpent/CMakeLists.txt

@@ -16,6 +16,7 @@ include_directories(..)
 set(EXECUTABLE serpent)
 
 file(GLOB HEADERS "*.h")
+
 if(ETH_STATIC)
 	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
 else()

libsolidity/CMakeLists.txt

@@ -18,15 +18,16 @@ include_directories(..)
 set(EXECUTABLE solidity)
 
 file(GLOB HEADERS "*.h") 
+
 if (ETH_STATIC)
 	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
 else()
 	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
 endif()
 
+target_link_libraries(${EXECUTABLE} ${JSONCPP_LIBRARIES})
 target_link_libraries(${EXECUTABLE} evmcore)
 target_link_libraries(${EXECUTABLE} devcore)
-target_link_libraries(${EXECUTABLE} ${JSONCPP_LIBRARIES})
 
 install( TARGETS ${EXECUTABLE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
 install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )

libweb3jsonrpc/CMakeLists.txt

@@ -9,9 +9,9 @@ set(CMAKE_AUTOMOC OFF)
 
 aux_source_directory(. SRC_LIST)
 
-include_directories(..)
 include_directories(${JSON_RPC_CPP_INCLUDE_DIRS})
 include_directories(${LEVELDB_INCLUDE_DIR})
+include_directories(..)
 
 set(EXECUTABLE web3jsonrpc)
 

libwebthree/CMakeLists.txt

@@ -17,6 +17,7 @@ include_directories(..)
 set(EXECUTABLE webthree)
 
 file(GLOB HEADERS "*.h")
+
 if (ETH_STATIC)
 	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
 else()

libwhisper/CMakeLists.txt

@@ -17,6 +17,7 @@ include_directories(${LEVELDB_INCLUDE_DIR})
 set(EXECUTABLE whisper)
 
 file(GLOB HEADERS "*.h")
+
 if (ETH_STATIC)
 	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
 else()

neth/CMakeLists.txt

@@ -18,7 +18,7 @@ if(MINIUPNPC_FOUND)
 target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LIBRARY})
 endif()
 
-if(JSON_RPC_CPP_FOUND)
+if (JSONRPC)
 	target_link_libraries(${EXECUTABLE} web3jsonrpc)
 endif()
 

secp256k1/CMakeLists.txt

@@ -24,6 +24,7 @@ if (APPLE OR UNIX)
 else()
 
 	include_directories(${Boost_INCLUDE_DIRS})
+
 	if (ETH_STATIC)
 		add_library(${EXECUTABLE} STATIC ${EXECUTABLE}.c)
 	else()

test/CMakeLists.txt

@@ -20,7 +20,7 @@ target_link_libraries(testeth webthree)
 target_link_libraries(testeth ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY_RELEASE})
 target_link_libraries(testeth ${CURL_LIBRARY})
 
-if (JSON_RPC_CPP_FOUND)
+if (JSONRPC)
 	target_link_libraries(testeth web3jsonrpc)
 	target_link_libraries(testeth ${JSON_RPC_CPP_CLIENT_LIBRARY})
 endif()

walleth/CMakeLists.txt

@@ -96,22 +96,7 @@ if (APPLE)
 		)
 	endif ()
 
-elseif ("${TARGET_PLATFORM}" STREQUAL "w64")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-keep-inline-dllexport -static-libgcc -static-libstdc++ -static")
-	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-s -Wl,-subsystem,windows -mthreads -L/usr/x86_64-w64-mingw32/plugins/platforms")
-	target_link_libraries(${EXECUTEABLE} gcc)
-	target_link_libraries(${EXECUTEABLE} mingw32 qtmain mswsock iphlpapi qwindows shlwapi Qt5PlatformSupport gdi32 comdlg32 oleaut32 imm32 winmm ole32 uuid ws2_32)
-	target_link_libraries(${EXECUTEABLE} boost_system-mt-s)
-	target_link_libraries(${EXECUTEABLE} boost_filesystem-mt-s)
-	target_link_libraries(${EXECUTEABLE} boost_thread_win32-mt-s)
-	target_link_libraries(${EXECUTEABLE} Qt5PlatformSupport)
-	set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS)
-elseif (UNIX)
 else ()
-	target_link_libraries(${EXECUTEABLE} boost_system)
-	target_link_libraries(${EXECUTEABLE} boost_filesystem)
-	find_package(Threads REQUIRED)
-	target_link_libraries(${EXECUTEABLE} ${CMAKE_THREAD_LIBS_INIT})
 	install( TARGETS ${EXECUTEABLE} RUNTIME DESTINATION bin )
 endif ()