The_Great_Archive/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2026-09-12 19:50:17 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'CMakeMigration-Modular' into CMakeMigration-Modular-Windows

Browse Source
This commit is contained in:
jolavillette 2026-05-21 04:20:23 +02:00
commit fb381f9dda
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
retroshare-gui/CMakeLists.txt
View File

@ -233,9 +233,9 @@ endif(RS_WEBUI)
if(RS_GUI_CMARK)
set(CMARK_DEVEL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../supportlibs/cmark/")
if(EXISTS "${LIBRETROSHARE_DEVEL_DIR}/.git" )
message( STATUS "cmark submodule found at ${LIBRETROSHARE_DEVEL_DIR} using it" )
add_subdirectory( "${LIBRETROSHARE_DEVEL_DIR}" "${CMAKE_BINARY_DIR}/cmark" )
if(EXISTS "${CMARK_DEVEL_DIR}/CMakeLists.txt" )
message( STATUS "cmark submodule found at ${CMARK_DEVEL_DIR} using it" )
add_subdirectory( "${CMARK_DEVEL_DIR}" "${CMAKE_BINARY_DIR}/cmark" )
else()
FetchContent_Declare(
cmark
@ -519,7 +519,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE ${RS_LINK_LIBRARIES})
target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src/)
set( CMAKE_CXX_FLAGS "-Wno-deprecated-declarations" )
target_compile_options(${PROJECT_NAME} PRIVATE -Wno-deprecated-declarations)
target_compile_definitions(${PROJECT_NAME} PUBLIC RS_NO_WARN_DEPRECATED )
target_compile_definitions(${PROJECT_NAME} PRIVATE RS_RELEASE_VERSION )
target_compile_definitions(${PROJECT_NAME} PRIVATE TARGET=\"retroshare\")

2
retroshare-service/CMakeLists.txt
View File

@ -30,7 +30,7 @@ option(
option(
RS_RNPLIB
"Enable use RNP lib for PGP"
OFF )
ON )
option(
RS_JSON_API