Browse Source

Merge pull request #2802 from arkpar/qt54-fix

Fixed mix build for qt 5.4
cl-refactor
Gav Wood 10 years ago
parent
commit
18a76edb83
  1. 2
      alethzero/CMakeLists.txt
  2. 2
      mix/CMakeLists.txt

2
alethzero/CMakeLists.txt

@ -22,7 +22,7 @@ include_directories(${Boost_INCLUDE_DIRS})
find_package (Qt5WebEngine)
find_package (Qt5WebEngineWidgets)
if (APPLE)
if (APPLE AND (NOT "${Qt5Core_VERSION_STRING}" VERSION_LESS "5.5"))
# TODO: remove indirect dependencies once macdeployqt is fixed
find_package (Qt5WebEngineCore)
find_package (Qt5DBus)

2
mix/CMakeLists.txt

@ -61,7 +61,7 @@ if (${ETH_HAVE_WEBENGINE})
add_definitions(-DETH_HAVE_WEBENGINE)
list(APPEND LIBRARIES "Qt5::WebEngine")
endif()
if (APPLE)
if (APPLE AND (NOT "${Qt5Core_VERSION_STRING}" VERSION_LESS "5.5"))
list(APPEND LIBRARIES "Qt5::WebEngineCore")
list(APPEND LIBRARIES "Qt5::DBus")
list(APPEND LIBRARIES "Qt5::PrintSupport")

Loading…
Cancel
Save