Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-12-17 17:43:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updates for macos sequoia to run retroshare-service

Browse source 
origin redDwarf03 <sylvain@archethic.net>
This commit is contained in:
redDwarf03 2025-04-25 21:07:38 +02:00 • committed by Christoph Johannes Kleine
parent 2c1a26ea3e
commit 28653ad92c
2 changed files with 52 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

45
retroshare-service/CMakeLists.txt
View file

@ -61,6 +61,21 @@ cmake_dependent_option(
set(FETCHCONTENT_QUIET OFF) set(FETCHCONTENT_QUIET OFF)
include(FetchContent) include(FetchContent)
# Find required dependencies
# find_package for Botan and json-c failed to populate variables, remove them.
# find_package(Botan 3 REQUIRED)
# message(STATUS "Botan_FOUND=${Botan_FOUND}")
# message(STATUS "BOTAN_LIBRARIES=${BOTAN_LIBRARIES}")
# message(STATUS "BOTAN_INCLUDE_DIRS=${BOTAN_INCLUDE_DIRS}")
#
# find_package(json-c REQUIRED)
# message(STATUS "json-c_FOUND=${json-c_FOUND}")
# message(STATUS "JSON-C_LIBRARIES=${JSON-C_LIBRARIES}")
# message(STATUS "JSON-C_INCLUDE_DIRS=${JSON-C_INCLUDE_DIRS}")
find_package(ZLIB REQUIRED)
find_package(BZip2 REQUIRED)
find_package(Git REQUIRED) find_package(Git REQUIRED)
################################################################################ ################################################################################
@ -113,6 +128,36 @@ target_link_libraries(${PROJECT_NAME} PRIVATE retroshare)
################################################################################ ################################################################################
# Add RNP build directories to linker search path
target_link_directories(${PROJECT_NAME} PRIVATE
${PROJECT_SOURCE_DIR}/../../supportlibs/librnp/Build/src/lib
${PROJECT_SOURCE_DIR}/../../supportlibs/librnp/Build/src/libsexpp
)
# Link libraries by name, including RNP libs and dependencies first
target_link_libraries(${PROJECT_NAME} PRIVATE
rnp # Link by name
sexpp
botan-3
json-c
bz2
z
retroshare
)
################################################################################
# Add include directories from found packages
# target_include_directories(${PROJECT_NAME} PRIVATE
# ${Botan_INCLUDE_DIRS}
# ${JSONC_INCLUDE_DIRS}
# )
# Link only libretroshare, it should handle its own dependencies now
target_link_libraries(${PROJECT_NAME} PRIVATE retroshare)
################################################################################
if(RS_SERVICE_DESKTOP) if(RS_SERVICE_DESKTOP)
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
install( install(

7
retroshare-service/src/retroshare-service.pro
View file

@ -67,6 +67,7 @@ unix {
macx { macx {
# ENABLE THIS OPTION FOR Univeral Binary BUILD. # ENABLE THIS OPTION FOR Univeral Binary BUILD.
#CONFIG += ppc x86 #CONFIG += ppc x86
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13
#QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 #QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4
LIBS += -lz LIBS += -lz
#LIBS += -lssl -lcrypto -lz -lgpgme -lgpg-error -lassuan #LIBS += -lssl -lcrypto -lz -lgpgme -lgpg-error -lassuan
@ -81,6 +82,12 @@ macx {
LIBS += -framework Security LIBS += -framework Security
LIBS += -framework Carbon LIBS += -framework Carbon
# Explicitly add RNP libs here for the service target
LIBRNP_BUILD_PATH = $$clean_path($${OUT_PWD}/../../supportlibs/librnp/Build)
LIBS += -L$$clean_path($${LIBRNP_BUILD_PATH}/src/lib) -lrnp
LIBS += -L$$clean_path($${LIBRNP_BUILD_PATH}/src/libsexpp) -lsexpp
LIBS += -lbz2 -lz -ljson-c -lbotan-3
for(lib, LIB_DIR):LIBS += -L"$$lib" for(lib, LIB_DIR):LIBS += -L"$$lib"
for(bin, BIN_DIR):LIBS += -L"$$bin" for(bin, BIN_DIR):LIBS += -L"$$bin"