debris
10 years ago
21 changed files with 197 additions and 382 deletions
@ -1,41 +1,24 @@ |
|||||
cmake_policy(SET CMP0015 NEW) |
cmake_policy(SET CMP0015 NEW) |
||||
|
set(CMAKE_AUTOMOC OFF) |
||||
|
|
||||
aux_source_directory(. SRC_LIST) |
aux_source_directory(. SRC_LIST) |
||||
|
|
||||
include_directories(..) |
|
||||
include_directories(${LEVELDB_INCLUDE_DIR}) |
include_directories(${LEVELDB_INCLUDE_DIR}) |
||||
|
include_directories(..) |
||||
|
|
||||
set(EXECUTABLE exp) |
set(EXECUTABLE exp) |
||||
|
|
||||
add_executable(${EXECUTABLE} ${SRC_LIST}) |
add_executable(${EXECUTABLE} ${SRC_LIST}) |
||||
|
|
||||
target_link_libraries(${EXECUTABLE} ethereum) |
target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARY}) |
||||
target_link_libraries(${EXECUTABLE} p2p) |
|
||||
target_link_libraries(${EXECUTABLE} gmp) |
|
||||
if(MINIUPNPC_LS) |
if(MINIUPNPC_LS) |
||||
target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LS}) |
target_link_libraries(${EXECUTABLE} ${MINIUPNPC_LS}) |
||||
endif() |
endif() |
||||
target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARY}) |
|
||||
|
|
||||
if ("${TARGET_PLATFORM}" STREQUAL "w64") |
target_link_libraries(${EXECUTABLE} ethereum) |
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++") |
target_link_libraries(${EXECUTABLE} p2p) |
||||
target_link_libraries(${EXECUTABLE} gcc) |
target_link_libraries(${EXECUTABLE} gmp) |
||||
target_link_libraries(${EXECUTABLE} gdi32) |
|
||||
target_link_libraries(${EXECUTABLE} ws2_32) |
install( TARGETS ${EXECUTABLE} DESTINATION bin) |
||||
target_link_libraries(${EXECUTABLE} mswsock) |
|
||||
target_link_libraries(${EXECUTABLE} shlwapi) |
|
||||
target_link_libraries(${EXECUTABLE} iphlpapi) |
|
||||
target_link_libraries(${EXECUTABLE} boost_system-mt-s) |
|
||||
target_link_libraries(${EXECUTABLE} boost_filesystem-mt-s) |
|
||||
target_link_libraries(${EXECUTABLE} boost_thread_win32-mt-s) |
|
||||
set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS) |
|
||||
elseif (UNIX) |
|
||||
else () |
|
||||
target_link_libraries(${EXECUTABLE} boost_system) |
|
||||
target_link_libraries(${EXECUTABLE} boost_filesystem) |
|
||||
find_package(Threads REQUIRED) |
|
||||
target_link_libraries(${EXECUTABLE} ${CMAKE_THREAD_LIBS_INIT}) |
|
||||
endif () |
|
||||
|
|
||||
install( TARGETS ${EXECUTABLE} DESTINATION bin ) |
|
||||
|
|
||||
|
|||||
@ -0,0 +1,11 @@ |
|||||
|
--- avfmediaplayersession.mm 2014-09-11 12:48:26.000000000 +0200
|
||||
|
+++ avfmediaplayersessionPatch.mm 2014-12-01 12:53:14.000000000 +0100
|
||||
|
@@ -295,7 +295,7 @@
|
||||
|
//AVPlayerItem "status" property value observer. |
||||
|
if (context == AVFMediaPlayerSessionObserverStatusObservationContext) |
||||
|
{ |
||||
|
- AVPlayerStatus status = [[change objectForKey:NSKeyValueChangeNewKey] integerValue];
|
||||
|
+ AVPlayerStatus status = (AVPlayerStatus)[[change objectForKey:NSKeyValueChangeNewKey] integerValue];
|
||||
|
switch (status) |
||||
|
{ |
||||
|
//Indicates that the status of the player is not yet known because |
||||
@ -1,111 +1,26 @@ |
|||||
cmake_policy(SET CMP0015 NEW) |
cmake_policy(SET CMP0015 OLD) |
||||
|
|
||||
if ("${TARGET_PLATFORM}" STREQUAL "w64") |
|
||||
cmake_policy(SET CMP0020 NEW) |
|
||||
endif () |
|
||||
|
|
||||
|
|
||||
set(CMAKE_INCLUDE_CURRENT_DIR ON) |
set(CMAKE_INCLUDE_CURRENT_DIR ON) |
||||
aux_source_directory(. SRC_LIST) |
aux_source_directory(. SRC_LIST) |
||||
|
|
||||
include_directories(..) |
include_directories(..) |
||||
include_directories(${JSON_RPC_CPP_INCLUDE_DIRS}) |
include_directories(${JSON_RPC_CPP_INCLUDE_DIRS}) |
||||
link_directories(../libethereum) |
|
||||
|
|
||||
# Find Qt5 for Apple and update src_list for windows |
|
||||
if (APPLE) |
|
||||
# homebrew defaults to qt4 and installs qt5 as 'keg-only' |
|
||||
# which places it into /usr/local/opt insteadof /usr/local. |
|
||||
|
|
||||
set(CMAKE_PREFIX_PATH /usr/local/opt/qt5) |
|
||||
include_directories(/usr/local/opt/qt5/include /usr/local/include) |
|
||||
elseif ("${TARGET_PLATFORM}" STREQUAL "w64") |
|
||||
set(SRC_LIST ${SRC_LIST} ../windows/qt_plugin_import.cpp) |
|
||||
elseif (UNIX) |
|
||||
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ";$ENV{QTDIR}/lib/cmake") |
|
||||
endif () |
|
||||
|
|
||||
find_package(Qt5Gui REQUIRED) |
|
||||
find_package(Qt5Quick REQUIRED) |
|
||||
find_package(Qt5Qml REQUIRED) |
|
||||
find_package(Qt5Network REQUIRED) |
|
||||
find_package(Qt5Widgets REQUIRED) |
|
||||
find_package(Qt5WebKit REQUIRED) |
|
||||
find_package(Qt5WebKitWidgets REQUIRED) |
|
||||
|
|
||||
set(EXECUTABLE qethereum) |
set(EXECUTABLE qethereum) |
||||
|
|
||||
# Set name of binary and add_executable() |
|
||||
if (APPLE) |
|
||||
set(CMAKE_INSTALL_PREFIX ./) |
|
||||
set(BIN_INSTALL_DIR ".") |
|
||||
set(DOC_INSTALL_DIR ".") |
|
||||
|
|
||||
set(PROJECT_VERSION "${ETH_VERSION}") |
|
||||
set(MACOSX_BUNDLE_INFO_STRING "${PROJECT_NAME} ${PROJECT_VERSION}") |
|
||||
set(MACOSX_BUNDLE_BUNDLE_VERSION "${PROJECT_NAME} ${PROJECT_VERSION}") |
|
||||
set(MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJECT_NAME} ${PROJECT_VERSION}") |
|
||||
set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${PROJECT_VERSION}") |
|
||||
set(MACOSX_BUNDLE_COPYRIGHT "${PROJECT_COPYRIGHT_YEAR} ${PROJECT_VENDOR}") |
|
||||
set(MACOSX_BUNDLE_GUI_IDENTIFIER "${PROJECT_DOMAIN_SECOND}.${PROJECT_DOMAIN_FIRST}") |
|
||||
set(MACOSX_BUNDLE_BUNDLE_NAME ${EXECUTABLE}) |
|
||||
include(BundleUtilities) |
|
||||
endif () |
|
||||
file(GLOB HEADERS "*.h") |
file(GLOB HEADERS "*.h") |
||||
|
|
||||
if(ETH_STATIC) |
if(ETH_STATIC) |
||||
add_library(${EXECUTABLE} STATIC ${RESOURCE_ADDED} ${SRC_LIST} ${HEADERS}) |
add_library(${EXECUTABLE} STATIC ${RESOURCE_ADDED} ${SRC_LIST} ${HEADERS}) |
||||
else() |
else() |
||||
add_library(${EXECUTABLE} SHARED ${RESOURCE_ADDED} ${SRC_LIST} ${HEADERS}) |
add_library(${EXECUTABLE} SHARED ${RESOURCE_ADDED} ${SRC_LIST} ${HEADERS}) |
||||
endif() |
endif() |
||||
|
|
||||
include_directories(/) |
|
||||
qt5_use_modules(${EXECUTABLE} Core Gui WebKit WebKitWidgets Widgets Network Quick Qml) |
qt5_use_modules(${EXECUTABLE} Core Gui WebKit WebKitWidgets Widgets Network Quick Qml) |
||||
target_link_libraries(${EXECUTABLE} ethereum secp256k1 ${JSON_RPC_CPP_LIBRARIES}) |
target_link_libraries(${EXECUTABLE} ethereum) |
||||
|
target_link_libraries(${EXECUTABLE} secp256k1) |
||||
if (APPLE) |
target_link_libraries(${EXECUTABLE} ${JSON_RPC_CPP_COMMON_LIBRARY}) |
||||
if (${ADDFRAMEWORKS}) |
target_link_libraries(${EXECUTABLE} ${JSON_RPC_CPP_SERVER_LIBRARY}) |
||||
set_target_properties(${EXECUTABLE} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/EthereumMacOSXBundleInfo.plist.in") |
|
||||
endif () |
|
||||
|
|
||||
SET_SOURCE_FILES_PROPERTIES(${EXECUTABLE} PROPERTIES MACOSX_PACKAGE_LOCATION MacOS) |
|
||||
|
|
||||
# This is a workaround for when the build-type defaults to Debug, and when a multi-config generator like xcode is used, where the type |
|
||||
# will not be set but defaults to release. |
|
||||
set(generator_lowercase "${CMAKE_GENERATOR}") |
|
||||
string(TOLOWER "${CMAKE_GENERATOR}" generator_lowercase) |
|
||||
if ("${generator_lowercase}" STREQUAL "xcode") |
|
||||
# TODO: Not sure how to resolve this. Possibly \${TARGET_BUILD_DIR} |
|
||||
set(binary_build_dir "${CMAKE_CURRENT_BINARY_DIR}/Debug") |
|
||||
else () |
|
||||
set(binary_build_dir "${CMAKE_CURRENT_BINARY_DIR}") |
|
||||
endif () |
|
||||
|
|
||||
set(APPS ${binary_build_dir}/${EXECUTABLE}) |
|
||||
|
|
||||
if (${ADDFRAMEWORKS}) |
|
||||
add_custom_target(addframeworks ALL |
|
||||
COMMAND /usr/local/opt/qt5/bin/macdeployqt ${binary_build_dir}/${EXECUTABLE} |
|
||||
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") |
|
||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-s -Wl,-subsystem,windows -mthreads -L/usr/x86_64-w64-mingw32/plugins/platforms") |
|
||||
target_link_libraries(${EXECUTABLE} gcc) |
|
||||
target_link_libraries(${EXECUTABLE} mingw32 qtmain mswsock iphlpapi qwindows shlwapi Qt5PlatformSupport gdi32 comdlg32 oleaut32 imm32 winmm ole32 uuid ws2_32) |
|
||||
target_link_libraries(${EXECUTABLE} boost_system-mt-s) |
|
||||
target_link_libraries(${EXECUTABLE} boost_filesystem-mt-s) |
|
||||
target_link_libraries(${EXECUTABLE} boost_thread_win32-mt-s) |
|
||||
target_link_libraries(${EXECUTABLE} Qt5PlatformSupport) |
|
||||
set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS) |
|
||||
elseif (UNIX) |
|
||||
else () |
|
||||
target_link_libraries(${EXECUTABLE} boost_system) |
|
||||
target_link_libraries(${EXECUTABLE} boost_filesystem) |
|
||||
find_package(Threads REQUIRED) |
|
||||
target_link_libraries(${EXECUTABLE} ${CMAKE_THREAD_LIBS_INIT}) |
|
||||
install( TARGETS ${EXECUTABLE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib ) |
|
||||
endif () |
|
||||
|
|
||||
|
install( TARGETS ${EXECUTABLE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib ) |
||||
|
install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} ) |
||||
|
|||||
Loading…
Reference in new issue