From d10125827d4f86251c4ac00de9a5956ad15ef38a Mon Sep 17 00:00:00 2001 From: Eric Lombrozo Date: Wed, 5 Mar 2014 15:11:59 -0800 Subject: [PATCH] app bundling and frameworks for os x are broken, so disable automatic bundling. --- walleth/CMakeLists.txt | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/walleth/CMakeLists.txt b/walleth/CMakeLists.txt index 24d9d34cf..5f6db9373 100644 --- a/walleth/CMakeLists.txt +++ b/walleth/CMakeLists.txt @@ -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) @@ -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")