Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-23 14:41:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

added needed flags for GXS

Browse source
This commit is contained in:
csoler 2022-03-27 19:34:09 +02:00
parent 8daa4dbf21
commit dc32b10ed6
2 changed files with 26 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

23
retroshare-gui/CMakeLists.txt
View file

@ -31,12 +31,12 @@ option(
RS_DEVELOPMENT_BUILD RS_DEVELOPMENT_BUILD
"Disable optimization to speed up build, enable verbose build log. \ "Disable optimization to speed up build, enable verbose build log. \
just for development purposes, not suitable for library usage" just for development purposes, not suitable for library usage"
OFF ) ON )
option( option(
RS_JSON_API RS_JSON_API
"Use restbed to expose libretroshare as JSON API via HTTP" "Use restbed to expose libretroshare as JSON API via HTTP"
ON ) OFF )
option( option(
RS_SERVICE_DESKTOP RS_SERVICE_DESKTOP
@ -48,6 +48,12 @@ option(
"Enable RetroShare login via terminal" "Enable RetroShare login via terminal"
ON ) ON )
option( RS_GXSGUI "Enable GXS services in GUI" ON )
option( RS_GXSCHANNELS "Enable GXS channels in GUI" ON )
option( RS_GXSFORUMS "Enable GXS forums in GUI" ON )
option( RS_GXSPOSTED "Enable GXS posted in GUI" ON )
option( RS_GXSCIRCLES "Enable GXS circles in GUI" ON )
cmake_dependent_option( cmake_dependent_option(
RS_SERVICE_TERMINAL_WEBUI_PASSWORD RS_SERVICE_TERMINAL_WEBUI_PASSWORD
"Enable settin Web UI password via terminal in retroshare-service" "Enable settin Web UI password via terminal in retroshare-service"
@ -71,9 +77,11 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON) set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOUIC ON)
find_package( Qt5 COMPONENTS Core REQUIRED)
find_package( Qt5 COMPONENTS Widgets REQUIRED) find_package( Qt5 COMPONENTS Widgets REQUIRED)
find_package( Qt5 COMPONENTS Xml REQUIRED) find_package( Qt5 COMPONENTS Xml REQUIRED)
find_package( Qt5 COMPONENTS Network REQUIRED) find_package( Qt5 COMPONENTS Network REQUIRED)
find_package( Qt5 COMPONENTS Multimedia REQUIRED)
find_package( Qt5 COMPONENTS PrintSupport REQUIRED) find_package( Qt5 COMPONENTS PrintSupport REQUIRED)
list( APPEND RS_LINK_LIBRARIES Qt5::Widgets Qt5::Xml Qt5::Network Qt5::PrintSupport) list( APPEND RS_LINK_LIBRARIES Qt5::Widgets Qt5::Xml Qt5::Network Qt5::PrintSupport)
@ -96,9 +104,13 @@ endif(RS_DEVELOPMENT_BUILD)
include(src/CMakeLists.txt) include(src/CMakeLists.txt)
add_executable(${PROJECT_NAME} ${RS_GUI_SOURCES} ${RS_GUI_FORMS} ${RS_GUI_QTRESOURCES}) qt5_wrap_ui(RS_UI_HEADERS ${RS_GUI_FORMS})
add_executable(${PROJECT_NAME} ${RS_GUI_SOURCES} ${RS_UI_HEADERS} ${RS_GUI_QTRESOURCES})
install(TARGETS ${PROJECT_NAME} DESTINATION ${RS_BIN_INSTALL_DIR}) install(TARGETS ${PROJECT_NAME} DESTINATION ${RS_BIN_INSTALL_DIR})
include_directories( ${CMAKE_BINARY_DIR} )
################################################################################ ################################################################################
if(RS_DEVELOPMENT_BUILD) if(RS_DEVELOPMENT_BUILD)
@ -452,8 +464,11 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/s
set( CMAKE_CXX_FLAGS "-Wno-deprecated-declarations" ) set( CMAKE_CXX_FLAGS "-Wno-deprecated-declarations" )
target_compile_definitions(${PROJECT_NAME} PUBLIC RS_NO_WARN_DEPRECATED ) target_compile_definitions(${PROJECT_NAME} PUBLIC RS_NO_WARN_DEPRECATED )
target_compile_definitions(${PROJECT_NAME} PRIVATE TARGET=\"retroshare\")
if(RS_GXS_CIRCLES)
target_compile_definitions(${PROJECT_NAME} PRIVATE RS_USE_CIRCLES )
endif(RS_GXS_CIRCLES)
#add_dependencies(${PROJECT_NAME} libretroshare) #add_dependencies(${PROJECT_NAME} libretroshare)

17
retroshare-gui/src/CMakeLists.txt
View file

@ -29,9 +29,6 @@ list(
src/gui/QuickStartWizard.cpp src/gui/QuickStartWizard.cpp
src/gui/StartDialog.cpp src/gui/StartDialog.cpp
src/gui/HomePage.cpp src/gui/HomePage.cpp
src/gui/PluginsPage.cpp
src/gui/PluginManagerWidget.cpp
src/gui/PluginManager.cpp
src/gui/ChatLobbyWidget.cpp src/gui/ChatLobbyWidget.cpp
src/gui/GetStartedDialog.cpp src/gui/GetStartedDialog.cpp
src/gui/GenCertDialog.cpp src/gui/GenCertDialog.cpp
@ -438,9 +435,6 @@ list(
src/gui/FriendsDialog.h src/gui/FriendsDialog.h
src/gui/ServicePermissionDialog.h src/gui/ServicePermissionDialog.h
src/gui/RemoteDirModel.h src/gui/RemoteDirModel.h
src/gui/PluginsPage.h
src/gui/PluginManagerWidget.h
src/gui/PluginManager.h
src/gui/RetroShareLink.h src/gui/RetroShareLink.h
src/gui/SearchTreeWidget.h src/gui/SearchTreeWidget.h
src/gui/ShareManager.h src/gui/ShareManager.h
@ -778,9 +772,7 @@ endif(RS_UNFINISHED_TRANSLATIONS)
if(RS_MESSENGER) if(RS_MESSENGER)
target_compile_definitions( target_compile_definitions( ${PROJECT_NAME} PUBLIC MESSENGER_WINDOW )
${PROJECT_NAME} PUBLIC MESSENGER_WINDOW
)
list( list(
APPEND RS_GUI_SOURCES APPEND RS_GUI_SOURCES
@ -1068,11 +1060,8 @@ if(RS_GXSIDENTITIES)
endif(RS_GXSIDENTITIES) endif(RS_GXSIDENTITIES)
if(RS_GXSCIRCLES) if(RS_GXSCIRCLES)
target_compile_definitions(
${PROJECT_NAME} PUBLIC RS_USE_CIRCLES
)
list( list(
APPEND RS_IMPLEMENTATION_HEADERS
src/gui/Circles/CirclesDialog.h src/gui/Circles/CirclesDialog.h
src/gui/Circles/CreateCircleDialog.h src/gui/Circles/CreateCircleDialog.h
src/gui/People/PeopleDialog.h src/gui/People/PeopleDialog.h
@ -1081,6 +1070,7 @@ if(RS_GXSCIRCLES)
) )
list( list(
APPEND RS_GUI_FORMS
src/gui/Circles/CirclesDialog.ui src/gui/Circles/CirclesDialog.ui
src/gui/Circles/CreateCircleDialog.ui src/gui/Circles/CreateCircleDialog.ui
src/gui/People/PeopleDialog.ui src/gui/People/PeopleDialog.ui
@ -1089,6 +1079,7 @@ if(RS_GXSCIRCLES)
) )
list( list(
APPEND RS_GUI_SOURCES
src/gui/Circles/CirclesDialog.cpp src/gui/Circles/CirclesDialog.cpp
src/gui/Circles/CreateCircleDialog.cpp src/gui/Circles/CreateCircleDialog.cpp
src/gui/People/PeopleDialog.cpp src/gui/People/PeopleDialog.cpp