Merge pull request #2963

a3fc675 cmake: fix x11 linking (xiphon)
This commit is contained in:
luigi1111 2020-06-19 16:58:28 -05:00
commit 0b2e74cdb5
No known key found for this signature in database
GPG key ID: F4ACA0183641E010

View file

@ -126,11 +126,6 @@ target_compile_definitions(monero-wallet-gui
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
if(X11_FOUND)
target_link_libraries(monero-wallet-gui ${X11_LIBRARIES} pthread dl xcb X11)
endif()
if(INSTALL_VENDORED_LIBUNBOUND)
set(UNBOUND_LIBRARY ${CMAKE_BINARY_DIR}/monero/external/unbound/libunbound.a)
else()
@ -162,6 +157,10 @@ if(DEVICE_TREZOR_READY)
target_link_libraries(monero-wallet-gui ${TREZOR_DEP_LIBS})
endif()
if(X11_FOUND)
target_link_libraries(monero-wallet-gui ${X11_LIBRARIES})
endif()
if(WITH_SCANNER)
target_link_libraries(monero-wallet-gui
${ZBAR_LIBRARIES}