layter
/
neroshop
mirror of https://github.com/layters/testshop
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

edit readme and CMakeLists.txt again

Browse Source
pull/274/head
larteyoh 3 weeks ago
parent 0ad5f8f1fe
commit d9a34dbbe5
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File

42
CMakeLists.txt
Unescape View File

@ -484,7 +484,7 @@ endif()
# neromon
set(neroshop_daemon "neromon")
set(neroshop_daemon_src ${neroshop_crypto_src} ${neroshop_database_src} ${neroshop_network_src} ${NEROSHOP_CORE_SRC_DIR}/protocol/messages/msgpack.cpp ${NEROSHOP_CORE_SRC_DIR}/protocol/p2p/key_mapper.cpp ${NEROSHOP_CORE_SRC_DIR}/protocol/p2p/node.cpp ${NEROSHOP_CORE_SRC_DIR}/protocol/p2p/routing_table.cpp ${NEROSHOP_CORE_SRC_DIR}/protocol/rpc/json_rpc.cpp ${NEROSHOP_CORE_SRC_DIR}/protocol/transport/client.cpp ${NEROSHOP_CORE_SRC_DIR}/protocol/transport/ip_address.cpp ${NEROSHOP_CORE_SRC_DIR}/protocol/transport/server.cpp ${NEROSHOP_CORE_SRC_DIR}/tools/base64.cpp ${NEROSHOP_CORE_SRC_DIR}/tools/logger.cpp ${NEROSHOP_CORE_SRC_DIR}/tools/timestamp.cpp)
add_executable(${neroshop_daemon} src/daemon/main.cpp ${neroshop_daemon_src})#target_link_libraries(daemon ${curl_src} ${OPENSSL_LIBRARIES}) # curl requires both openssl(used in monero) and zlib(used in libi2pd)
add_executable(${neroshop_daemon} src/daemon/main.cpp ${neroshop_daemon_src})
install(TARGETS ${neroshop_daemon} DESTINATION bin)
target_compile_definitions(${neroshop_daemon} PRIVATE NEROSHOP_DEBUG)
target_include_directories(${neroshop_daemon} PRIVATE #[[${CMAKE_CURRENT_SOURCE_DIR}/src/]] ${monero_include_dirs} ${monero_cpp_include_dir} ${sqlite_include_dir} ${json_include_dir} ${zlib_include_dir} ${i2pd_include_dirs} ${cxxopts_include_dir})
@ -493,14 +493,14 @@ target_link_libraries(${neroshop_daemon} ${i2pd_src} ${i2pd_daemon_src} ${monero
######################################
# neroshop-console
if(NEROSHOP_BUILD_CLI)
set(neroshop_console "neroshop-console")
add_executable(${neroshop_console} src/console/main.cpp ${neroshop_client_src})
install(TARGETS ${neroshop_console} DESTINATION bin)
target_compile_definitions(${neroshop_console} PRIVATE NEROSHOP_DEBUG)
target_include_directories(${neroshop_console} PRIVATE #[[${CMAKE_CURRENT_SOURCE_DIR}/src/]] ${monero_include_dirs} ${monero_cpp_include_dir} ${sqlite_include_dir} ${json_include_dir} ${zlib_include_dir} ${i2pd_include_dirs} ${lua_include_dir} ${curl_include_dirs} ${stduuid_include_dirs} ${linenoise_include_dir})
target_link_libraries(${neroshop_console} ${i2pd_src} ${monero_cpp_src} ${sqlite_src} #[[${qrcodegen_src}]] ${curl_src} ${monero_src} ${zlib_src} ${lua_src} ${linenoise_src})
set(neroshop_cli "neroshop-console")
add_executable(${neroshop_cli} src/console/main.cpp ${neroshop_client_src})
install(TARGETS ${neroshop_cli} DESTINATION bin)
target_compile_definitions(${neroshop_cli} PRIVATE NEROSHOP_DEBUG)
target_include_directories(${neroshop_cli} PRIVATE #[[${CMAKE_CURRENT_SOURCE_DIR}/src/]] ${monero_include_dirs} ${monero_cpp_include_dir} ${sqlite_include_dir} ${json_include_dir} ${zlib_include_dir} ${i2pd_include_dirs} ${lua_include_dir} ${curl_include_dirs} ${stduuid_include_dirs} ${linenoise_include_dir})
target_link_libraries(${neroshop_cli} ${i2pd_src} ${monero_cpp_src} ${sqlite_src} #[[${qrcodegen_src}]] ${curl_src} ${monero_src} ${zlib_src} ${lua_src} ${linenoise_src})
message(STATUS "${BoldMagenta}NEROSHOP_BUILD_CLI option set to ON${ColourReset}")
target_compile_definitions(${neroshop_console} PRIVATE NEROSHOP_BUILD_CLI)
target_compile_definitions(${neroshop_cli} PRIVATE NEROSHOP_BUILD_CLI)
endif()
######################################
@ -510,7 +510,7 @@ if(NEROSHOP_BUILD_GUI)
add_executable(${neroshop_gui})
install(TARGETS ${neroshop_gui} DESTINATION bin)
target_sources(${neroshop_gui} PRIVATE ${neroshop_res} src/gui/main.cpp src/gui/script_manager.cpp src/gui/wallet_controller.cpp src/gui/user_controller.cpp src/gui/image_loader.cpp src/gui/image_provider.cpp src/gui/wallet_qr_provider.cpp src/gui/currency_rate_provider.cpp #[[src/gui/table_model.cpp]] src/gui/daemon_manager.cpp src/gui/enum_wrapper.cpp src/gui/proxy_manager.cpp src/gui/backend.cpp ${neroshop_client_src})
target_compile_definitions(${neroshop_gui} PRIVATE NEROSHOP_DEBUG)#set_target_properties(${neroshop_gui} PROPERTIES COMPILE_DEFINITIONS "NEROSHOP_DEBUG")
target_compile_definitions(${neroshop_gui} PRIVATE NEROSHOP_DEBUG)
target_include_directories(${neroshop_gui} PRIVATE #[[${CMAKE_CURRENT_SOURCE_DIR}/src/]] ${monero_include_dirs} ${monero_cpp_include_dir} ${sqlite_include_dir} ${json_include_dir} ${zlib_include_dir} ${i2pd_include_dirs} ${lua_include_dir} ${qrcodegen_include_dir})
target_link_libraries(${neroshop_gui} ${i2pd_src} ${monero_cpp_src} ${sqlite_src} ${qrcodegen_src} ${monero_src} ${zlib_src} ${lua_src})
message(STATUS "${BoldMagenta}NEROSHOP_BUILD_GUI option set to ON${ColourReset}")
@ -525,14 +525,14 @@ add_subdirectory(assets)
if(NEROSHOP_USE_GRPC)
message(STATUS "Using gRPC")
target_compile_definitions(${neroshop_gui} PRIVATE NEROSHOP_USE_GRPC)
target_compile_definitions(${neroshop_console} PRIVATE NEROSHOP_USE_GRPC)
target_compile_definitions(${neroshop_cli} PRIVATE NEROSHOP_USE_GRPC)
target_compile_definitions(${neroshop_daemon} PRIVATE NEROSHOP_USE_GRPC)
if(NEROSHOP_USE_SYSTEM_GRPC)
# Find system-installed gRPC
find_package(gRPC CONFIG REQUIRED)
message(STATUS "USE_SYSTEM_GRPC option set to ON")
target_link_libraries(${neroshop_gui} gRPC::grpc++)
target_link_libraries(${neroshop_console} gRPC::grpc++)
target_link_libraries(${neroshop_cli} gRPC::grpc++)
target_link_libraries(${neroshop_daemon} gRPC::grpc++)
else()
# Build gRPC using FetchContent or add_subdirectory
@ -546,7 +546,7 @@ if(NOT NEROSHOP_USE_LIBZMQ AND NOT NEROSHOP_USE_LIBUV)
target_compile_definitions(${neroshop_gui} PRIVATE NEROSHOP_USE_SYSTEM_SOCKETS)
endif()
if(NEROSHOP_BUILD_CLI)
target_compile_definitions(${neroshop_console} PRIVATE NEROSHOP_USE_SYSTEM_SOCKETS)
target_compile_definitions(${neroshop_cli} PRIVATE NEROSHOP_USE_SYSTEM_SOCKETS)
endif()
target_compile_definitions(${neroshop_daemon} PRIVATE NEROSHOP_USE_SYSTEM_SOCKETS)
endif()
@ -562,8 +562,8 @@ if(ZeroMQ_FOUND)
target_link_libraries(${neroshop_gui} ${ZeroMQ_LIBRARIES})
endif()
if(NEROSHOP_BUILD_CLI)
target_compile_definitions(${neroshop_console} PRIVATE NEROSHOP_USE_LIBZMQ)
target_link_libraries(${neroshop_console} ${ZeroMQ_LIBRARIES})
target_compile_definitions(${neroshop_cli} PRIVATE NEROSHOP_USE_LIBZMQ)
target_link_libraries(${neroshop_cli} ${ZeroMQ_LIBRARIES})
endif()
target_compile_definitions(${neroshop_daemon} PRIVATE NEROSHOP_USE_LIBZMQ)
target_link_libraries(${neroshop_daemon} ${ZeroMQ_LIBRARIES})
@ -573,7 +573,7 @@ endif()
######################################
if (UUID_TIME_GENERATOR) # -DUUID_TIME_GENERATOR=1
if(NEROSHOP_BUILD_CLI)
target_compile_definitions(${neroshop_console} PRIVATE UUID_TIME_GENERATOR)
target_compile_definitions(${neroshop_cli} PRIVATE UUID_TIME_GENERATOR)
endif()
endif()
@ -584,7 +584,7 @@ if(WIN32)
target_link_libraries(${neroshop_gui} ${winsock2_src})
endif()
if(NEROSHOP_BUILD_CLI)
target_link_libraries(${neroshop_console} ${winsock2_src})
target_link_libraries(${neroshop_cli} ${winsock2_src})
endif()
target_link_libraries(${neroshop_daemon} ${winsock2_src})
endif()
@ -597,8 +597,8 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
if (LIBUUID_FOUND)
message(STATUS "Using LibUUID: ${LibUUID_LIBRARY}")
if(NEROSHOP_BUILD_CLI)
target_compile_definitions(${neroshop_console} PRIVATE UUID_SYSTEM_GENERATOR) # uuids::uuid_system_generator
target_link_libraries(${neroshop_console} ${LibUUID_LIBRARY})
target_compile_definitions(${neroshop_cli} PRIVATE UUID_SYSTEM_GENERATOR) # uuids::uuid_system_generator
target_link_libraries(${neroshop_cli} ${LibUUID_LIBRARY})
endif()
endif()
endif()
@ -608,7 +608,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
target_link_libraries(${neroshop_gui} ${posix_src})
endif()
if(NEROSHOP_BUILD_CLI)
target_link_libraries(${neroshop_console} ${posix_src})
target_link_libraries(${neroshop_cli} ${posix_src})
endif()
target_link_libraries(${neroshop_daemon} ${posix_src})
endif()
@ -620,8 +620,8 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
message(STATUS "UUID_SYSTEM_GENERATOR option set to ON")
message(STATUS "Using CFLIB: ${CFLIB}")
if(NEROSHOP_BUILD_CLI)
target_compile_definitions(${neroshop_console} PRIVATE UUID_SYSTEM_GENERATOR) # uuids::uuid_system_generator
target_link_libraries(${neroshop_console} ${CFLIB})
target_compile_definitions(${neroshop_cli} PRIVATE UUID_SYSTEM_GENERATOR) # uuids::uuid_system_generator
target_link_libraries(${neroshop_cli} ${CFLIB})
endif()
endif()
endif()

2
README.md
Unescape View File

@ -241,7 +241,7 @@ WW2pQTQWHpyJf2CHrCmZG7Tn3zBnYRZTH8g4U3pSZf5s6xsTXrZc9odDWmrWzjRc9MMQWrKXxjHsRdzH
- Git Mirrors:
- [Codeberg](https://codeberg.org/layter/neroshop)
- [Gitea](https://git.wownero.com/layter/neroshop)
- [Radicle](rad:z2Y72SYpHTkiRXrn4hkZaf1VYhc7J)
- [Radicle](https://radicle.xyz): `rad:z2Y72SYpHTkiRXrn4hkZaf1VYhc7J`
- Lemmy: https://monero.town/c/neroshop
- Mail: neroshop@protonmail.com
- Matrix Rooms:

Write Preview
Loading…
Cancel
Save