mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 20:12:57 +01:00
39ff085409
3828a79711 scripted-diff: prefer MAC_OSX over __APPLE__ (fanquake)
fa6e841e89 gui: remove macOS ProgressBar workaround (fanquake)
68c272527f gui: remove SubstituteFonts (fanquake)
6c6dbd8af5 doc: mention that macOS 10.10 is now required (fanquake)
84b0cfa8b6 release: bump minimum required macOS to 10.10 (fanquake)
26b15df99d depends: set OSX_MIN_VERSION to 10.10 (fanquake)
Pull request description:
Closes #13362
d99abfddb0c8f2111340a6127e77cc686e0043d8
This workaround should no longer be required, as it should have only been in use when compiled with the 10.7 SDK, which we haven't been building with for a while now.
5bc5ae30982a0f0f6a9804b05d99434af770c724
The bugreport linked with this code is for an unrelated? issue, however from what I can tell the correct QTBUG is this one https://bugreports.qt.io/browse/QTBUG-20880. Reading though the discussion there, it seems that the way progress bars are animated changed in macOS 10.10.
Qt was patched [here (5.5+)](https://codereview.qt-project.org/#/c/112379/):
> Disable progress bar animations on 10.10 Yosemite and higher - the native style does not animate them any more. Keep the indeterminate progress bar animation.
Given all of that, I don't think this is worth keeping around, as it would seem to only be useful in the case that a macOS user is compiling with a Qt < 5.5. That should be pretty unlikely, as we don't support downloaded Qt binaries, and brew currently provides [5.11.1](571b46213c/Formula/qt.rb).
Tree-SHA512: 4278cb30cc9bcb313e166129ecf032c808995f8b51a3123637c47860a0010ac88f86f82ec44792153b6b1e5cca595f25013b2eaeae80194647b9ce4f7eaf32c1
92 lines
2.5 KiB
CMake
92 lines
2.5 KiB
CMake
# This CMakeLists.txt is not meant to actually work!
|
|
# It only serves as a dummy project to make CLion work properly when it comes to symbol resolution and all the nice
|
|
# features dependent on that. Building must still be done on the command line using the automake build chain
|
|
# If you load this project in CLion and would like to run/debug executables, make sure to remove the "Build" entry from
|
|
# the run/debug configuration as otherwise CLion will try to build this project with cmake, failing horribly.
|
|
# You'll also have to manually change the executable in the configuration to the correct path of the already built executable
|
|
|
|
cmake_minimum_required(VERSION 3.7)
|
|
project(dash)
|
|
|
|
set(CMAKE_CXX_STANDARD 14)
|
|
|
|
include_directories(
|
|
src
|
|
src/qt/forms
|
|
src/leveldb/include
|
|
src/univalue/include
|
|
)
|
|
|
|
if(UNIX AND NOT APPLE)
|
|
set(DEPENDS_PREFIX depends/x86_64-pc-linux-gnu)
|
|
elseif(APPLE)
|
|
set(DEPENDS_PREFIX depends/x86_64-apple-darwin14)
|
|
elseif(WIN32)
|
|
set(DEPENDS_PREFIX depends/x86_64-w64-mingw32)
|
|
endif()
|
|
|
|
message(STATUS "DEPENDS_PREFIX: ${DEPENDS_PREFIX}")
|
|
|
|
if(DEFINED DEPENDS_PREFIX)
|
|
include_directories(${DEPENDS_PREFIX}/include)
|
|
include_directories(${DEPENDS_PREFIX}/include/QtWidgets)
|
|
endif()
|
|
|
|
add_definitions(
|
|
-DENABLE_CRASH_HOOKS=1
|
|
-DENABLE_STACKTRACES=1
|
|
-DENABLE_WALLET=1
|
|
)
|
|
|
|
file(GLOB SOURCE_FILES
|
|
src/*.cpp
|
|
src/*.h
|
|
src/bench/*.cpp
|
|
src/bench/*.h
|
|
src/bls/*.cpp
|
|
src/bls/*.h
|
|
src/compat/*.cpp
|
|
src/compat/*.h
|
|
src/consensus/*.cpp
|
|
src/consensus/*.h
|
|
src/crypto/*.c
|
|
src/crypto/*.cpp
|
|
src/crypto/*.h
|
|
src/evo/*.cpp
|
|
src/evo/*.h
|
|
src/leveldb/db/*.cc
|
|
src/leveldb/db/*.h
|
|
src/leveldb/include/*.h
|
|
src/llmq/*.cpp
|
|
src/llmq/*.h
|
|
src/masternode/*.cpp
|
|
src/masternode/*.h
|
|
src/policy/*.cpp
|
|
src/policy/*.h
|
|
src/primitives/*.cpp
|
|
src/primitives/*.h
|
|
src/privatesend/*.cpp
|
|
src/privatesend/*.h
|
|
src/qt/*.cpp
|
|
src/qt/*.h
|
|
src/qt/test/*.cpp
|
|
src/qt/test/*.h
|
|
src/rpc/*.cpp
|
|
src/rpc/*.h
|
|
src/script/*.cpp
|
|
src/script/*.h
|
|
src/secp256k1/include/*.h
|
|
src/test/*.cpp
|
|
src/test/*.h
|
|
src/univalue/include/*.h
|
|
src/univalue/lib/*.cpp
|
|
src/univalue/lib/*.h
|
|
src/wallet/*.cpp
|
|
src/wallet/*.h
|
|
src/wallet/test/*.cpp
|
|
src/zmq/*.cpp
|
|
src/zmq/*.h
|
|
)
|
|
|
|
add_executable(dash ${SOURCE_FILES})
|