lukechilds
/
ethminer
mirror of https://github.com/lukechilds/ethminer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

added headers to ethrpc cmake

cl-refactor
Marek Kotewicz 10 years ago
parent
f9e2c8e092 fc14f46a63
commit
defcdcb26e
19 changed files with 50 additions and 68 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      alethzero/CMakeLists.txt
  2. 3
      eth/CMakeLists.txt
  3. 7
      libdevcore/CMakeLists.txt
  4. 8
      libdevcrypto/CMakeLists.txt
  5. 8
      libethcore/CMakeLists.txt
  6. 8
      libethereum/CMakeLists.txt
  7. 7
      libethrpc/CMakeLists.txt
  8. 1
      libethrpc/CorsHttpServer.cpp
  9. 1
      libethrpc/EthStubServer.cpp
  10. 8
      libevm/CMakeLists.txt
  11. 8
      libevmface/CMakeLists.txt
  12. 8
      liblll/CMakeLists.txt
  13. 8
      libp2p/CMakeLists.txt
  14. 5
      libqethereum/CMakeLists.txt
  15. 8
      libserpent/CMakeLists.txt
  16. 8
      libwebthree/CMakeLists.txt
  17. 8
      libwhisper/CMakeLists.txt
  18. 4
      test/CMakeLists.txt
  19. 5
      third/CMakeLists.txt

5
alethzero/CMakeLists.txt
View File

@ -25,6 +25,7 @@ find_package(Qt5WebKitWidgets REQUIRED)
qt5_wrap_ui(ui_Main.h Main.ui) qt5_wrap_ui(ui_Main.h Main.ui)
# Set name of binary and add_executable() # Set name of binary and add_executable()
file(GLOB HEADERS "*.h")
if (APPLE) if (APPLE)
set(EXECUTEABLE AlethZero) set(EXECUTEABLE AlethZero)
set(BIN_INSTALL_DIR ".") set(BIN_INSTALL_DIR ".")
@ -41,14 +42,14 @@ if (APPLE)
set(MACOSX_BUNDLE_ICON_FILE alethzero) set(MACOSX_BUNDLE_ICON_FILE alethzero)
include(BundleUtilities) include(BundleUtilities)
add_executable(${EXECUTEABLE} MACOSX_BUNDLE alethzero.icns Main.ui ${SRC_LIST}) add_executable(${EXECUTEABLE} MACOSX_BUNDLE alethzero.icns Main.ui ${SRC_LIST} ${HEADERS})
set_target_properties(${EXECUTEABLE} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/EthereumMacOSXBundleInfo.plist.in") set_target_properties(${EXECUTEABLE} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/EthereumMacOSXBundleInfo.plist.in")
SET_SOURCE_FILES_PROPERTIES(${EXECUTEABLE} PROPERTIES MACOSX_PACKAGE_LOCATION MacOS) SET_SOURCE_FILES_PROPERTIES(${EXECUTEABLE} PROPERTIES MACOSX_PACKAGE_LOCATION MacOS)
SET_SOURCE_FILES_PROPERTIES(${MACOSX_BUNDLE_ICON_FILE}.icns PROPERTIES MACOSX_PACKAGE_LOCATION "Resources") SET_SOURCE_FILES_PROPERTIES(${MACOSX_BUNDLE_ICON_FILE}.icns PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
else () else ()
set(EXECUTEABLE alethzero) set(EXECUTEABLE alethzero)
add_executable(${EXECUTEABLE} Main.ui ${SRC_LIST}) add_executable(${EXECUTEABLE} Main.ui ${SRC_LIST} ${HEADERS})
endif () endif ()
qt5_use_modules(${EXECUTEABLE} Core)# Gui Widgets Network WebKit WebKitWidgets) qt5_use_modules(${EXECUTEABLE} Core)# Gui Widgets Network WebKit WebKitWidgets)

3
eth/CMakeLists.txt
View File

@ -8,7 +8,8 @@ link_directories(../libwebthree)
set(EXECUTABLE eth) set(EXECUTABLE eth)
add_executable(${EXECUTABLE} ${SRC_LIST}) file(GLOB HEADERS "*.h")
add_executable(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
target_link_libraries(${EXECUTABLE} webthree) target_link_libraries(${EXECUTABLE} webthree)
target_link_libraries(${EXECUTABLE} secp256k1) target_link_libraries(${EXECUTABLE} secp256k1)

7
libdevcore/CMakeLists.txt
View File

@ -10,13 +10,12 @@ aux_source_directory(. SRC_LIST)
set(EXECUTABLE devcore) set(EXECUTABLE devcore)
# set(CMAKE_INSTALL_PREFIX ../lib) file(GLOB HEADERS "*.h")
if(ETH_STATIC) if(ETH_STATIC)
add_library(${EXECUTABLE} STATIC ${SRC_LIST}) add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
else() else()
add_library(${EXECUTABLE} SHARED ${SRC_LIST}) add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
endif() endif()
file(GLOB HEADERS "*.h")
include_directories(..) include_directories(..)

8
libdevcrypto/CMakeLists.txt
View File

@ -4,15 +4,13 @@ aux_source_directory(. SRC_LIST)
set(EXECUTABLE devcrypto) set(EXECUTABLE devcrypto)
# set(CMAKE_INSTALL_PREFIX ../lib) file(GLOB HEADERS "*.h")
if(ETH_STATIC) if(ETH_STATIC)
add_library(${EXECUTABLE} STATIC ${SRC_LIST}) add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
else() else()
add_library(${EXECUTABLE} SHARED ${SRC_LIST}) add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
endif() endif()
file(GLOB HEADERS "*.h")
include_directories(..) include_directories(..)
target_link_libraries(${EXECUTABLE} devcore) target_link_libraries(${EXECUTABLE} devcore)

8
libethcore/CMakeLists.txt
View File

@ -4,15 +4,13 @@ aux_source_directory(. SRC_LIST)
set(EXECUTABLE ethcore) set(EXECUTABLE ethcore)
# set(CMAKE_INSTALL_PREFIX ../lib) file(GLOB HEADERS "*.h")
if(ETH_STATIC) if(ETH_STATIC)
add_library(${EXECUTABLE} STATIC ${SRC_LIST}) add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
else() else()
add_library(${EXECUTABLE} SHARED ${SRC_LIST}) add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
endif() endif()
file(GLOB HEADERS "*.h")
include_directories(..) include_directories(..)
target_link_libraries(${EXECUTABLE} devcrypto) target_link_libraries(${EXECUTABLE} devcrypto)

8
libethereum/CMakeLists.txt
View File

@ -6,15 +6,13 @@ aux_source_directory(. SRC_LIST)
set(EXECUTABLE ethereum) set(EXECUTABLE ethereum)
# set(CMAKE_INSTALL_PREFIX ../lib) file(GLOB HEADERS "*.h")
if(ETH_STATIC) if(ETH_STATIC)
add_library(${EXECUTABLE} STATIC ${SRC_LIST}) add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
else() else()
add_library(${EXECUTABLE} SHARED ${SRC_LIST}) add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
endif() endif()
file(GLOB HEADERS "*.h")
include_directories(..) include_directories(..)
target_link_libraries(${EXECUTABLE} evm) target_link_libraries(${EXECUTABLE} evm)

7
libethrpc/CMakeLists.txt
View File

@ -7,15 +7,14 @@ link_directories(../libethcore)
link_directories(../libwebthree) link_directories(../libwebthree)
set(EXECUTABLE ethrpc) set(EXECUTABLE ethrpc)
file(GLOB HEADERS "*.h")
if(ETH_STATIC) if(ETH_STATIC)
add_library(${EXECUTABLE} STATIC ${SRC_LIST}) add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
else() else()
add_library(${EXECUTABLE} SHARED ${SRC_LIST}) add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
endif() endif()
file(GLOB HEADERS "*.h")
target_link_libraries(${EXECUTABLE} webthree) target_link_libraries(${EXECUTABLE} webthree)
target_link_libraries(${EXECUTABLE} secp256k1) target_link_libraries(${EXECUTABLE} secp256k1)
target_link_libraries(${EXECUTABLE} gmp) target_link_libraries(${EXECUTABLE} gmp)

1
libethrpc/CorsHttpServer.cpp
View File

@ -39,5 +39,4 @@ bool CorsHttpServer::SendResponse(const std::string &response, void *addInfo)
return false; return false;
} }
} }

1
libethrpc/EthStubServer.cpp
View File

@ -28,6 +28,7 @@
#include <libethereum/Client.h> #include <libethereum/Client.h>
#include <libwebthree/WebThree.h> #include <libwebthree/WebThree.h>
#include <libdevcore/CommonJS.h> #include <libdevcore/CommonJS.h>
using namespace std; using namespace std;
using namespace dev; using namespace dev;
using namespace dev::eth; using namespace dev::eth;

8
libevm/CMakeLists.txt
View File

@ -6,15 +6,13 @@ aux_source_directory(. SRC_LIST)
set(EXECUTABLE evm) set(EXECUTABLE evm)
# set(CMAKE_INSTALL_PREFIX ../lib) file(GLOB HEADERS "*.h")
if(ETH_STATIC) if(ETH_STATIC)
add_library(${EXECUTABLE} STATIC ${SRC_LIST}) add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
else() else()
add_library(${EXECUTABLE} SHARED ${SRC_LIST}) add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
endif() endif()
file(GLOB HEADERS "*.h")
include_directories(..) include_directories(..)
target_link_libraries(${EXECUTABLE} ethcore) target_link_libraries(${EXECUTABLE} ethcore)

8
libevmface/CMakeLists.txt
View File

@ -6,15 +6,13 @@ aux_source_directory(. SRC_LIST)
set(EXECUTABLE evmface) set(EXECUTABLE evmface)
# set(CMAKE_INSTALL_PREFIX ../lib) file(GLOB HEADERS "*.h")
if(ETH_STATIC) if(ETH_STATIC)
add_library(${EXECUTABLE} STATIC ${SRC_LIST}) add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
else() else()
add_library(${EXECUTABLE} SHARED ${SRC_LIST}) add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
endif() endif()
file(GLOB HEADERS "*.h")
include_directories(..) include_directories(..)
target_link_libraries(${EXECUTABLE} devcore) target_link_libraries(${EXECUTABLE} devcore)

8
liblll/CMakeLists.txt
View File

@ -6,15 +6,13 @@ aux_source_directory(. SRC_LIST)
set(EXECUTABLE lll) set(EXECUTABLE lll)
# set(CMAKE_INSTALL_PREFIX ../lib) file(GLOB HEADERS "*.h")
if(ETH_STATIC) if(ETH_STATIC)
add_library(${EXECUTABLE} STATIC ${SRC_LIST}) add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
else() else()
add_library(${EXECUTABLE} SHARED ${SRC_LIST}) add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
endif() endif()
file(GLOB HEADERS "*.h")
include_directories(..) include_directories(..)
target_link_libraries(${EXECUTABLE} evmface) target_link_libraries(${EXECUTABLE} evmface)

8
libp2p/CMakeLists.txt
View File

@ -6,15 +6,13 @@ aux_source_directory(. SRC_LIST)
set(EXECUTABLE p2p) set(EXECUTABLE p2p)
# set(CMAKE_INSTALL_PREFIX ../lib) file(GLOB HEADERS "*.h")
if(ETH_STATIC) if(ETH_STATIC)
add_library(${EXECUTABLE} STATIC ${SRC_LIST}) add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
else() else()
add_library(${EXECUTABLE} SHARED ${SRC_LIST}) add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
endif() endif()
file(GLOB HEADERS "*.h")
include_directories(..) include_directories(..)
target_link_libraries(${EXECUTABLE} devcrypto) target_link_libraries(${EXECUTABLE} devcrypto)

5
libqethereum/CMakeLists.txt
View File

@ -51,10 +51,11 @@ if (APPLE)
include(BundleUtilities) include(BundleUtilities)
endif () endif ()
file(GLOB HEADERS "*.h")
if(ETH_STATIC) if(ETH_STATIC)
add_library(${EXECUTABLE} STATIC ${RESOURCE_ADDED} ${SRC_LIST}) add_library(${EXECUTABLE} STATIC ${RESOURCE_ADDED} ${SRC_LIST} ${HEADERS})
else() else()
add_library(${EXECUTABLE} SHARED ${RESOURCE_ADDED} ${SRC_LIST}) add_library(${EXECUTABLE} SHARED ${RESOURCE_ADDED} ${SRC_LIST} ${HEADERS})
endif() endif()
include_directories(/) include_directories(/)

8
libserpent/CMakeLists.txt
View File

@ -6,15 +6,13 @@ aux_source_directory(. SRC_LIST)
set(EXECUTABLE serpent) set(EXECUTABLE serpent)
# set(CMAKE_INSTALL_PREFIX ../lib) file(GLOB HEADERS "*.h")
if(ETH_STATIC) if(ETH_STATIC)
add_library(${EXECUTABLE} STATIC ${SRC_LIST}) add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
else() else()
add_library(${EXECUTABLE} SHARED ${SRC_LIST}) add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
endif() endif()
file(GLOB HEADERS "*.h")
include_directories(..) include_directories(..)
target_link_libraries(${EXECUTABLE} lll) target_link_libraries(${EXECUTABLE} lll)

8
libwebthree/CMakeLists.txt
View File

@ -6,15 +6,13 @@ aux_source_directory(. SRC_LIST)
set(EXECUTABLE webthree) set(EXECUTABLE webthree)
# set(CMAKE_INSTALL_PREFIX ../lib) file(GLOB HEADERS "*.h")
if(ETH_STATIC) if(ETH_STATIC)
add_library(${EXECUTABLE} STATIC ${SRC_LIST}) add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
else() else()
add_library(${EXECUTABLE} SHARED ${SRC_LIST}) add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
endif() endif()
file(GLOB HEADERS "*.h")
include_directories(..) include_directories(..)
target_link_libraries(${EXECUTABLE} ethereum) target_link_libraries(${EXECUTABLE} ethereum)

8
libwhisper/CMakeLists.txt
View File

@ -6,15 +6,13 @@ aux_source_directory(. SRC_LIST)
set(EXECUTABLE whisper) set(EXECUTABLE whisper)
# set(CMAKE_INSTALL_PREFIX ../lib) file(GLOB HEADERS "*.h")
if(ETH_STATIC) if(ETH_STATIC)
add_library(${EXECUTABLE} STATIC ${SRC_LIST}) add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
else() else()
add_library(${EXECUTABLE} SHARED ${SRC_LIST}) add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
endif() endif()
file(GLOB HEADERS "*.h")
include_directories(..) include_directories(..)
target_link_libraries(${EXECUTABLE} ethcore) target_link_libraries(${EXECUTABLE} ethcore)

4
test/CMakeLists.txt
View File

@ -6,8 +6,8 @@ include_directories(..)
link_directories(../libethcore) link_directories(../libethcore)
link_directories(../libethereum) link_directories(../libethereum)
file(GLOB HEADERS "*.h")
add_executable(testeth ${SRC_LIST}) add_executable(testeth ${SRC_LIST} ${HEADERS})
target_link_libraries(testeth ethereum) target_link_libraries(testeth ethereum)
target_link_libraries(testeth ethcore) target_link_libraries(testeth ethcore)

5
third/CMakeLists.txt
View File

@ -25,6 +25,7 @@ find_package(Qt5WebKitWidgets REQUIRED)
qt5_wrap_ui(ui_Main.h Main.ui) qt5_wrap_ui(ui_Main.h Main.ui)
# Set name of binary and add_executable() # Set name of binary and add_executable()
file(GLOB HEADERS "*.h")
if (APPLE) if (APPLE)
set(EXECUTEABLE Third) set(EXECUTEABLE Third)
set(BIN_INSTALL_DIR ".") set(BIN_INSTALL_DIR ".")
@ -41,14 +42,14 @@ if (APPLE)
set(MACOSX_BUNDLE_ICON_FILE third) set(MACOSX_BUNDLE_ICON_FILE third)
include(BundleUtilities) include(BundleUtilities)
add_executable(${EXECUTEABLE} MACOSX_BUNDLE third.icns Main.ui ${SRC_LIST}) add_executable(${EXECUTEABLE} MACOSX_BUNDLE third.icns Main.ui ${SRC_LIST} ${HEADERS})
set_target_properties(${EXECUTEABLE} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/EthereumMacOSXBundleInfo.plist.in") set_target_properties(${EXECUTEABLE} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/EthereumMacOSXBundleInfo.plist.in")
SET_SOURCE_FILES_PROPERTIES(${EXECUTEABLE} PROPERTIES MACOSX_PACKAGE_LOCATION MacOS) SET_SOURCE_FILES_PROPERTIES(${EXECUTEABLE} PROPERTIES MACOSX_PACKAGE_LOCATION MacOS)
SET_SOURCE_FILES_PROPERTIES(${MACOSX_BUNDLE_ICON_FILE}.icns PROPERTIES MACOSX_PACKAGE_LOCATION "Resources") SET_SOURCE_FILES_PROPERTIES(${MACOSX_BUNDLE_ICON_FILE}.icns PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
else () else ()
set(EXECUTEABLE third) set(EXECUTEABLE third)
add_executable(${EXECUTEABLE} Main.ui ${SRC_LIST}) add_executable(${EXECUTEABLE} Main.ui ${SRC_LIST} ${HEADERS})
endif () endif ()
qt5_use_modules(${EXECUTEABLE} Core)# Gui Widgets Network WebKit WebKitWidgets) qt5_use_modules(${EXECUTEABLE} Core)# Gui Widgets Network WebKit WebKitWidgets)

Write Preview
Loading…
Cancel
Save