Skip to content

Commit 7c26fa0

Browse files
debrisdebris
committed
common changes in cmakes
1 parent 281a9e2 commit 7c26fa0

3 files changed

Lines changed: 42 additions & 60 deletions

File tree

‎mix/CMakeLists.txt‎

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ qt5_add_resources(UI_RESOURCES qml.qrc)
1414
# Set name of binary and add_executable()
1515
file(GLOB HEADERS "*.h")
1616
if (APPLE)
17-
set(EXECUTEABLE mix)
17+
set(EXECUTABLE mix)
1818
set(BIN_INSTALL_DIR ".")
1919
set(DOC_INSTALL_DIR ".")
2020

@@ -25,48 +25,48 @@ if (APPLE)
2525
set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${PROJECT_VERSION}")
2626
set(MACOSX_BUNDLE_COPYRIGHT "${PROJECT_COPYRIGHT_YEAR} ${PROJECT_VENDOR}")
2727
set(MACOSX_BUNDLE_GUI_IDENTIFIER "${PROJECT_DOMAIN_SECOND}.${PROJECT_DOMAIN_FIRST}")
28-
set(MACOSX_BUNDLE_BUNDLE_NAME ${EXECUTEABLE})
28+
set(MACOSX_BUNDLE_BUNDLE_NAME ${EXECUTABLE})
2929
set(MACOSX_BUNDLE_ICON_FILE mix)
3030
include(BundleUtilities)
3131

32-
add_executable(${EXECUTEABLE} MACOSX_BUNDLE ${SRC_LIST} ${HEADERS} ${UI_RESOURCES})
33-
set_target_properties(${EXECUTEABLE} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/EthereumMacOSXBundleInfo.plist.in")
34-
SET_SOURCE_FILES_PROPERTIES(${EXECUTEABLE} PROPERTIES MACOSX_PACKAGE_LOCATION MacOS)
32+
add_executable(${EXECUTABLE} MACOSX_BUNDLE ${SRC_LIST} ${HEADERS} ${UI_RESOURCES})
33+
set_target_properties(${EXECUTABLE} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/EthereumMacOSXBundleInfo.plist.in")
34+
SET_SOURCE_FILES_PROPERTIES(${EXECUTABLE} PROPERTIES MACOSX_PACKAGE_LOCATION MacOS)
3535
SET_SOURCE_FILES_PROPERTIES(${MACOSX_BUNDLE_ICON_FILE}.icns PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
3636

3737
else ()
38-
set(EXECUTEABLE mix)
39-
add_executable(${EXECUTEABLE} ${SRC_LIST} ${HEADERS} ${UI_RESOURCES})
38+
set(EXECUTABLE mix)
39+
add_executable(${EXECUTABLE} ${SRC_LIST} ${HEADERS} ${UI_RESOURCES})
4040
endif ()
4141

42-
target_link_libraries(${EXECUTEABLE} Qt5::Core)
43-
target_link_libraries(${EXECUTEABLE} Qt5::Gui)
44-
target_link_libraries(${EXECUTEABLE} webthree)
45-
target_link_libraries(${EXECUTEABLE} qethereum)
46-
target_link_libraries(${EXECUTEABLE} ethereum)
47-
target_link_libraries(${EXECUTEABLE} evm)
48-
target_link_libraries(${EXECUTEABLE} ethcore)
49-
target_link_libraries(${EXECUTEABLE} devcrypto)
50-
target_link_libraries(${EXECUTEABLE} secp256k1)
51-
target_link_libraries(${EXECUTEABLE} serpent)
52-
target_link_libraries(${EXECUTEABLE} lll)
53-
target_link_libraries(${EXECUTEABLE} solidity)
54-
target_link_libraries(${EXECUTEABLE} evmcore)
55-
target_link_libraries(${EXECUTEABLE} devcore)
56-
target_link_libraries(${EXECUTEABLE} web3jsonrpc)
57-
target_link_libraries(${EXECUTEABLE} jsqrc)
42+
target_link_libraries(${EXECUTABLE} Qt5::Core)
43+
target_link_libraries(${EXECUTABLE} Qt5::Gui)
44+
target_link_libraries(${EXECUTABLE} webthree)
45+
target_link_libraries(${EXECUTABLE} qethereum)
46+
target_link_libraries(${EXECUTABLE} ethereum)
47+
target_link_libraries(${EXECUTABLE} evm)
48+
target_link_libraries(${EXECUTABLE} ethcore)
49+
target_link_libraries(${EXECUTABLE} devcrypto)
50+
target_link_libraries(${EXECUTABLE} secp256k1)
51+
target_link_libraries(${EXECUTABLE} serpent)
52+
target_link_libraries(${EXECUTABLE} lll)
53+
target_link_libraries(${EXECUTABLE} solidity)
54+
target_link_libraries(${EXECUTABLE} evmcore)
55+
target_link_libraries(${EXECUTABLE} devcore)
56+
target_link_libraries(${EXECUTABLE} web3jsonrpc)
57+
target_link_libraries(${EXECUTABLE} jsqrc)
5858

5959
if (APPLE)
6060
# First have qt5 install plugins and frameworks
61-
add_custom_command(TARGET ${EXECUTEABLE} POST_BUILD
62-
COMMAND ${CMAKE_DEPENDENCY_INSTALL_DIR}/bin/macdeployqt -qmldir=${CMAKE_CURRENT_SOURCE_DIR}/qml ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${EXECUTEABLE}.app
61+
add_custom_command(TARGET ${EXECUTABLE} POST_BUILD
62+
COMMAND ${CMAKE_DEPENDENCY_INSTALL_DIR}/bin/macdeployqt -qmldir=${CMAKE_CURRENT_SOURCE_DIR}/qml ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${EXECUTABLE}.app
6363
WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
6464

6565
# This tool and next will inspect linked libraries in order to determine which dependencies are required
6666
if (${CMAKE_CFG_INTDIR} STREQUAL ".")
67-
set(APP_BUNDLE_PATH "${CMAKE_CURRENT_BINARY_DIR}/${EXECUTEABLE}.app")
67+
set(APP_BUNDLE_PATH "${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE}.app")
6868
else ()
69-
set(APP_BUNDLE_PATH "${CMAKE_CURRENT_BINARY_DIR}/\$ENV{CONFIGURATION}/${EXECUTEABLE}.app")
69+
set(APP_BUNDLE_PATH "${CMAKE_CURRENT_BINARY_DIR}/\$ENV{CONFIGURATION}/${EXECUTABLE}.app")
7070
endif ()
7171
install(CODE "
7272
include(BundleUtilities)
@@ -81,5 +81,6 @@ if (APPLE)
8181
endif ()
8282
")
8383
else()
84-
install( TARGETS ${EXECUTEABLE} RUNTIME DESTINATION bin)
84+
install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin)
8585
endif ()
86+

‎neth/CMakeLists.txt‎

Lines changed: 11 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,52 +2,31 @@ cmake_policy(SET CMP0015 NEW)
22

33
aux_source_directory(. SRC_LIST)
44

5-
include_directories(..)
65
include_directories(${JSON_RPC_CPP_INCLUDE_DIRS})
76
include_directories(${LEVELDB_INCLUDE_DIR})
7+
include_directories(..)
88

99
set(EXECUTABLE neth)
1010

1111
add_executable(${EXECUTABLE} ${SRC_LIST})
1212

13-
target_link_libraries(${EXECUTABLE} webthree)
14-
target_link_libraries(${EXECUTABLE} ethereum)
15-
target_link_libraries(${EXECUTABLE} secp256k1)
16-
target_link_libraries(${EXECUTABLE} gmp)
13+
add_dependencies(${EXECUTABLE} BuildInfo.h)
14+
15+
target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARY})
16+
1717
if(MINIUPNPC_FOUND)
1818
target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LIBRARY})
1919
endif()
20-
target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARY})
20+
2121
if(JSON_RPC_CPP_FOUND)
2222
target_link_libraries(${EXECUTABLE} web3jsonrpc)
2323
endif()
2424

25-
if ("${TARGET_PLATFORM}" STREQUAL "w64")
26-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++")
27-
target_link_libraries(${EXECUTABLE} gcc)
28-
target_link_libraries(${EXECUTABLE} gdi32)
29-
target_link_libraries(${EXECUTABLE} ws2_32)
30-
target_link_libraries(${EXECUTABLE} mswsock)
31-
target_link_libraries(${EXECUTABLE} shlwapi)
32-
target_link_libraries(${EXECUTABLE} iphlpapi)
33-
target_link_libraries(${EXECUTABLE} cryptopp)
34-
target_link_libraries(${EXECUTABLE} ncurses)
35-
target_link_libraries(${EXECUTABLE} form)
36-
target_link_libraries(${EXECUTABLE} boost_system-mt-s)
37-
target_link_libraries(${EXECUTABLE} boost_filesystem-mt-s)
38-
target_link_libraries(${EXECUTABLE} boost_thread_win32-mt-s)
39-
set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS)
40-
elseif (UNIX)
41-
target_link_libraries(${EXECUTABLE} ncurses)
42-
target_link_libraries(${EXECUTABLE} form)
43-
else ()
44-
target_link_libraries(${EXECUTABLE} boost_system)
45-
target_link_libraries(${EXECUTABLE} boost_filesystem)
46-
target_link_libraries(${EXECUTABLE} ncurses)
47-
target_link_libraries(${EXECUTABLE} form)
48-
find_package(Threads REQUIRED)
49-
target_link_libraries(${EXECUTABLE} ${CMAKE_THREAD_LIBS_INIT})
50-
endif ()
25+
target_link_libraries(${EXECUTABLE} webthree)
26+
target_link_libraries(${EXECUTABLE} ethereum)
27+
target_link_libraries(${EXECUTABLE} secp256k1)
28+
target_link_libraries(${EXECUTABLE} ncurses)
29+
target_link_libraries(${EXECUTABLE} form)
5130

5231
install( TARGETS ${EXECUTABLE} DESTINATION bin )
5332

‎third/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ else ()
4040
add_executable(${EXECUTABLE} Main.ui ${SRC_LIST} ${HEADERS})
4141
endif ()
4242

43+
add_dependencies(${EXECUTABLE} BuildInfo.h)
44+
4345
target_link_libraries(${EXECUTABLE} Qt5::Core)
4446
target_link_libraries(${EXECUTABLE} webthree)
4547
target_link_libraries(${EXECUTABLE} qethereum)

0 commit comments

Comments
 (0)