Browse Source

cmake-macos remove unused.

cl-refactor
subtly 11 years ago
parent
commit
8d1dffeafd
  1. 7
      alethzero/CMakeLists.txt
  2. 5
      libethereum/CMakeLists.txt
  3. 2
      secp256k1/CMakeLists.txt

7
alethzero/CMakeLists.txt

@ -24,12 +24,12 @@ endif ()
find_package(Qt5Widgets REQUIRED) find_package(Qt5Widgets REQUIRED)
qt5_wrap_ui(Main.ui) qt5_wrap_ui(ui_Main.h Main.ui)
# Set name of binary and add_executable() # Set name of binary and add_executable()
if (APPLE) if (APPLE)
set(EXECUTEABLE AlethZero) set(EXECUTEABLE AlethZero)
set(CMAKE_INSTALL_PREFIX ./) # set(CMAKE_INSTALL_PREFIX ./)
set(BIN_INSTALL_DIR ".") set(BIN_INSTALL_DIR ".")
set(DOC_INSTALL_DIR ".") set(DOC_INSTALL_DIR ".")
@ -53,7 +53,7 @@ qt5_use_modules(${EXECUTEABLE} Core Gui Widgets Network)
target_link_libraries(${EXECUTEABLE} ethereum secp256k1 cryptopp) target_link_libraries(${EXECUTEABLE} ethereum secp256k1 cryptopp)
if (APPLE) if (APPLE)
target_link_libraries(${EXECUTEABLE} boost_system boost_filesystem gmp leveldb miniupnpc snappy) # target_link_libraries(${EXECUTEABLE} boost_system boost_filesystem gmp leveldb miniupnpc snappy)
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)
@ -69,7 +69,6 @@ if (APPLE)
set(binary_build_dir "${CMAKE_CURRENT_BINARY_DIR}") set(binary_build_dir "${CMAKE_CURRENT_BINARY_DIR}")
endif () endif ()
get_filename_component(APP_INSTALL_PATH ${CMAKE_INSTALL_PREFIX} REALPATH)
set(APPS ${binary_build_dir}/${EXECUTEABLE}.app) set(APPS ${binary_build_dir}/${EXECUTEABLE}.app)
install(CODE " install(CODE "

5
libethereum/CMakeLists.txt

@ -5,7 +5,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB")
aux_source_directory(. SRC_LIST) aux_source_directory(. SRC_LIST)
if(APPLE) if(APPLE)
set(CMAKE_INSTALL_PREFIX ../lib) # set(CMAKE_INSTALL_PREFIX ../lib)
add_library(ethereum SHARED ${SRC_LIST}) add_library(ethereum SHARED ${SRC_LIST})
else() else()
add_library(ethereum ${SRC_LIST}) add_library(ethereum ${SRC_LIST})
@ -20,6 +20,7 @@ target_link_libraries(ethereum miniupnpc)
target_link_libraries(ethereum leveldb) target_link_libraries(ethereum leveldb)
target_link_libraries(ethereum gmp) target_link_libraries(ethereum gmp)
if(${TARGET_PLATFORM} STREQUAL "w64") if(${TARGET_PLATFORM} STREQUAL "w64")
include_directories(/usr/x86_64-w64-mingw32/include/cryptopp) include_directories(/usr/x86_64-w64-mingw32/include/cryptopp)
target_link_libraries(ethereum cryptopp) target_link_libraries(ethereum cryptopp)
@ -38,8 +39,8 @@ else ()
target_link_libraries(ethereum ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(ethereum ${CMAKE_THREAD_LIBS_INIT})
endif () endif ()
target_link_libraries(ethereum cryptopp)
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
link_directories(/usr/local/lib)
include_directories(/usr/local/include) include_directories(/usr/local/include)
endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

2
secp256k1/CMakeLists.txt

@ -4,7 +4,7 @@ set(CMAKE_ASM_COMPILER "yasm")
#aux_source_directory(. SRC_LIST) #aux_source_directory(. SRC_LIST)
if(APPLE) if(APPLE)
set(CMAKE_INSTALL_PREFIX ../lib) # set(CMAKE_INSTALL_PREFIX ../lib)
add_library(secp256k1 SHARED secp256k1.c field_5x52_asm.asm) add_library(secp256k1 SHARED secp256k1.c field_5x52_asm.asm)
else() else()
add_library(secp256k1 secp256k1.c field_5x52_asm.asm) add_library(secp256k1 secp256k1.c field_5x52_asm.asm)

Loading…
Cancel
Save