From da4e0dbf0f20d386928619137c9a6c52d52a7157 Mon Sep 17 00:00:00 2001 From: xiphon Date: Wed, 13 May 2020 14:26:14 +0000 Subject: [PATCH] cmake: rename monero-gui binary to monero-wallet-gui --- CMakeLists.txt | 2 +- src/CMakeLists.txt | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1fe5528e..6a5444ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -432,5 +432,5 @@ endif() add_subdirectory(src) # Required to make wallet_merged build before the gui -add_dependencies(monero-gui wallet_merged) +add_dependencies(monero-wallet-gui wallet_merged) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3c45c5c4..3a1e60ef 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -80,25 +80,25 @@ if(MINGW) list(APPEND RESOURCES ${ICON_RES}) endif() -add_executable(monero-gui ${EXECUTABLE_FLAG} main/main.cpp +add_executable(monero-wallet-gui ${EXECUTABLE_FLAG} main/main.cpp ${SOURCE_FILES} ${PASS_STRENGTH_FILES} ${QR_CODE_FILES} ${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 -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: 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_HEADERS *.h) -target_include_directories(monero-gui PUBLIC +target_include_directories(monero-wallet-gui PUBLIC ${CMAKE_SOURCE_DIR}/monero/include ${CMAKE_SOURCE_DIR}/monero/src ${CMAKE_SOURCE_DIR}/monero/external/easylogging++ @@ -118,7 +118,7 @@ target_include_directories(monero-gui PUBLIC ${ZBAR_INCLUDE_DIR} ) -target_compile_definitions(monero-gui +target_compile_definitions(monero-wallet-gui PUBLIC ${Qt5Widgets_DEFINITIONS} ${Qt5Qml_DEFINITIONS} @@ -128,14 +128,14 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") 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() if(DEVICE_TREZOR_READY) - target_link_libraries(monero-gui ${TREZOR_DEP_LIBS}) + target_link_libraries(monero-wallet-gui ${TREZOR_DEP_LIBS}) endif() -target_link_libraries(monero-gui +target_link_libraries(monero-wallet-gui ${CMAKE_BINARY_DIR}/lib/libwallet_merged.a ${LMDB_LIBRARY} ${CMAKE_BINARY_DIR}/monero/contrib/epee/src/libepee.a @@ -157,7 +157,7 @@ target_link_libraries(monero-gui ) if(WITH_SCANNER) - target_link_libraries(monero-gui + target_link_libraries(monero-wallet-gui ${ZBAR_LIBRARIES} jpeg v4l2 @@ -166,6 +166,6 @@ if(WITH_SCANNER) ) endif() -install(TARGETS monero-gui +install(TARGETS monero-wallet-gui DESTINATION ${CMAKE_INSTALL_PREFIX} )