Skip to content
This repository has been archived by the owner on Oct 28, 2021. It is now read-only.

Commit

Permalink
app bundling and frameworks for os x are broken, so disable automatic…
Browse files Browse the repository at this point in the history 
… bundling.
  • Loading branch information
@CodeShark @TiimJiim
CodeShark authored and TiimJiim committed Mar 6, 2014
1 parent 2f30342 commit d101258
Showing 1 changed file with 11 additions and 7 deletions.
18 changes: 11 additions & 7 deletions walleth/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,9 @@ qt5_use_modules(${EXECUTEABLE} Core Gui Widgets Network Quick Qml)
target_link_libraries(${EXECUTEABLE} ethereum secp256k1 ${CRYPTOPP_LIBRARIES})

if (APPLE)
set_target_properties(${EXECUTEABLE} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/EthereumMacOSXBundleInfo.plist.in")
if (${ADDFRAMEWORKS})
set_target_properties(${EXECUTEABLE} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/EthereumMacOSXBundleInfo.plist.in")
endif ()

SET_SOURCE_FILES_PROPERTIES(${EXECUTEABLE} PROPERTIES MACOSX_PACKAGE_LOCATION MacOS)

Expand All @@ -81,12 +83,14 @@ if (APPLE)
set(BU_CHMOD_BUNDLE_ITEMS 1)
fixup_bundle(\"${APPS}\" \"${BUNDLELIBS}\" \"../libethereum ../secp256k1\")
" COMPONENT RUNTIME )

add_custom_target(addframeworks ALL
COMMAND /usr/local/opt/qt5/bin/macdeployqt ${binary_build_dir}/${EXECUTEABLE}.app
WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
DEPENDS ${PROJECT_NAME}
)

if (${ADDFRAMEWORKS})
add_custom_target(addframeworks ALL
COMMAND /usr/local/opt/qt5/bin/macdeployqt ${binary_build_dir}/${EXECUTEABLE}.app
WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
DEPENDS ${PROJECT_NAME}
)
endif ()

elseif (${TARGET_PLATFORM} STREQUAL "w64")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-keep-inline-dllexport -static-libgcc -static-libstdc++ -static")
Expand Down

5 comments on commit d101258

@EthereumBuilder
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity Ethereum :: Cpp Ethereum Build 200 is now running

@EthereumBuilder
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity Ethereum :: Cpp Ethereum Build 200 outcome was FAILURE
Summary: Exit code 2 Build time: 0:6:40

@EthereumBuilder
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity Ethereum :: Cpp Ethereum Build 202 is now running

@EthereumBuilder
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity Ethereum :: Cpp Ethereum Build 202 outcome was SUCCESS
Summary: Running Build time: 0:10:48

@bobsummerwill
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @CodeShark!

Please could you let me know an e-mail address for you?

It is in relation to this cpp-ethereum re-licensing effort!

You contributed 14 commits. Thanks!

ethereum/webthree-umbrella#530

PS. Hey, @programmerTim! Is this e-mail address for you correct too? Thanks!

https://github.com/ethereum/webthree-umbrella/wiki/Contributors

Please sign in to comment.