wownero
/
wow-app
Archived
4
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Merge pull request #2906

Browse Source 
da4e0db cmake: rename monero-gui binary to monero-wallet-gui (xiphon)
pull/7/head
luigi1111 4 years ago
parent 2a8960bc2c da4e0dbf0f
commit eab98e3a48
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File

2
CMakeLists.txt
Unescape View File

@ -432,5 +432,5 @@ endif()
add_subdirectory(src) add_subdirectory(src)
# Required to make wallet_merged build before the gui # Required to make wallet_merged build before the gui
add_dependencies(monero-gui wallet_merged) add_dependencies(monero-wallet-gui wallet_merged)

22
src/CMakeLists.txt
Unescape View File

@ -80,25 +80,25 @@ if(MINGW)
list(APPEND RESOURCES ${ICON_RES}) list(APPEND RESOURCES ${ICON_RES})
endif() endif()
add_executable(monero-gui ${EXECUTABLE_FLAG} main/main.cpp add_executable(monero-wallet-gui ${EXECUTABLE_FLAG} main/main.cpp
${SOURCE_FILES} ${SOURCE_FILES}
${PASS_STRENGTH_FILES} ${PASS_STRENGTH_FILES}
${QR_CODE_FILES} ${QR_CODE_FILES}
${RESOURCES} ${RESOURCES}
) )
set_property(TARGET monero-gui PROPERTY RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") set_property(TARGET monero-wallet-gui PROPERTY RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
# OpenGL # OpenGL
target_include_directories(monero-gui PUBLIC ${OPENGL_INCLUDE_DIR}) target_include_directories(monero-wallet-gui PUBLIC ${OPENGL_INCLUDE_DIR})
message(STATUS "OpenGL: include dir at ${OPENGL_INCLUDE_DIR}") message(STATUS "OpenGL: include dir at ${OPENGL_INCLUDE_DIR}")
message(STATUS "OpenGL: libraries at ${OPENGL_LIBRARIES}") message(STATUS "OpenGL: libraries at ${OPENGL_LIBRARIES}")
target_include_directories(monero-gui PUBLIC ${Qt5Gui_PRIVATE_INCLUDE_DIRS}) target_include_directories(monero-wallet-gui PUBLIC ${Qt5Gui_PRIVATE_INCLUDE_DIRS})
file(GLOB_RECURSE SRC_SOURCES *.cpp) file(GLOB_RECURSE SRC_SOURCES *.cpp)
file(GLOB_RECURSE SRC_HEADERS *.h) file(GLOB_RECURSE SRC_HEADERS *.h)
target_include_directories(monero-gui PUBLIC target_include_directories(monero-wallet-gui PUBLIC
${CMAKE_SOURCE_DIR}/monero/include ${CMAKE_SOURCE_DIR}/monero/include
${CMAKE_SOURCE_DIR}/monero/src ${CMAKE_SOURCE_DIR}/monero/src
${CMAKE_SOURCE_DIR}/monero/external/easylogging++ ${CMAKE_SOURCE_DIR}/monero/external/easylogging++
@ -118,7 +118,7 @@ target_include_directories(monero-gui PUBLIC
${ZBAR_INCLUDE_DIR} ${ZBAR_INCLUDE_DIR}
) )
target_compile_definitions(monero-gui target_compile_definitions(monero-wallet-gui
PUBLIC PUBLIC
${Qt5Widgets_DEFINITIONS} ${Qt5Widgets_DEFINITIONS}
${Qt5Qml_DEFINITIONS} ${Qt5Qml_DEFINITIONS}
@ -127,14 +127,14 @@ target_compile_definitions(monero-gui
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
if(X11_FOUND) if(X11_FOUND)
target_link_libraries(monero-gui ${X11_LIBRARIES} pthread dl Xt xcb X11) target_link_libraries(monero-wallet-gui ${X11_LIBRARIES} pthread dl Xt xcb X11)
endif() endif()
if(DEVICE_TREZOR_READY) if(DEVICE_TREZOR_READY)
target_link_libraries(monero-gui ${TREZOR_DEP_LIBS}) target_link_libraries(monero-wallet-gui ${TREZOR_DEP_LIBS})
endif() endif()
target_link_libraries(monero-gui target_link_libraries(monero-wallet-gui
${CMAKE_BINARY_DIR}/lib/libwallet_merged.a ${CMAKE_BINARY_DIR}/lib/libwallet_merged.a
${LMDB_LIBRARY} ${LMDB_LIBRARY}
${CMAKE_BINARY_DIR}/monero/contrib/epee/src/libepee.a ${CMAKE_BINARY_DIR}/monero/contrib/epee/src/libepee.a
@ -156,7 +156,7 @@ target_link_libraries(monero-gui
) )
if(WITH_SCANNER) if(WITH_SCANNER)
target_link_libraries(monero-gui target_link_libraries(monero-wallet-gui
${ZBAR_LIBRARIES} ${ZBAR_LIBRARIES}
jpeg jpeg
v4l2 v4l2
@ -165,6 +165,6 @@ if(WITH_SCANNER)
) )
endif() endif()
install(TARGETS monero-gui install(TARGETS monero-wallet-gui
DESTINATION ${CMAKE_INSTALL_PREFIX} DESTINATION ${CMAKE_INSTALL_PREFIX}
) )