Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-03 11:00:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed compilatin

Browse Source
This commit is contained in:
csoler 2022-03-25 23:35:12 +01:00
parent bf1b3ed69a
commit a0ac041582
3 changed files with 953 additions and 944 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
retroshare-gui/CMakeLists.txt
View File

@ -62,6 +62,22 @@ cmake_dependent_option(
"RS_JSON_API"
ON )
################################ QT FILES #######################################
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
find_package( Qt5 COMPONENTS Widgets REQUIRED)
find_package( Qt5 COMPONENTS Xml REQUIRED)
find_package( Qt5 COMPONENTS Network REQUIRED)
find_package( Qt5 COMPONENTS PrintSupport REQUIRED)
list( APPEND RS_LINK_LIBRARIES Qt5::Widgets Qt5::Xml Qt5::Network Qt5::PrintSupport)
################################################################################
set(FETCHCONTENT_QUIET OFF)
@ -80,8 +96,7 @@ endif(RS_DEVELOPMENT_BUILD)
include(src/CMakeLists.txt)
add_executable(${PROJECT_NAME} ${RS_SOURCES} ${RS_FORMS} ${RS_QTRESOURCES})
add_executable(${PROJECT_NAME} ${RS_GUI_SOURCES} ${RS_GUI_FORMS} ${RS_GUI_QTRESOURCES})
install(TARGETS ${PROJECT_NAME} DESTINATION ${RS_BIN_INSTALL_DIR})
################################################################################
@ -111,6 +126,8 @@ else()
FetchContent_MakeAvailable(libretroshare)
endif()
target_include_directories(${PROJECT_NAME} PRIVATE ${LIBRETROSHARE_DEVEL_DIR}/src/)
################################################################################
if(RS_SERVICE_DESKTOP)
@ -161,10 +178,6 @@ endif(RS_JSON_API)
################################################################################
################################################################################
# TODO #
################################################################################
if(RS_GUI_CMARK)
set(CMARK_DEVEL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../supportlibs/cmark/")
if(EXISTS "${LIBRETROSHARE_DEVEL_DIR}/.git" )
@ -184,6 +197,10 @@ if(RS_GUI_CMARK)
endif(RS_GUI_CMARK)
################################################################################
# TODO #
################################################################################
# # Auto detect installed version of cmark
# rs_gui_cmark {
# DEFINES *= USE_CMARK
@ -427,23 +444,16 @@ endif(RS_SANITIZE)
# LIBS *= -lglib-2.0
# }
################################ QT FILES #######################################
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
find_package( Qt5 COMPONENTS Widgets REQUIRED)
list( APPEND RS_LINK_LIBRARIES Qt5::Widget )
################################ GENERAL #######################################
target_link_libraries(${PROJECT_NAME} PRIVATE ${RS_LINK_LIBRARIES})
add_dependencies(${PROJECT_NAME} libretroshare)
target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src/)
set( CMAKE_CXX_FLAGS "-Wno-deprecated-declarations" )
target_compile_definitions(${PROJECT_NAME} PUBLIC RS_NO_WARN_DEPRECATED )
#add_dependencies(${PROJECT_NAME} libretroshare)
install(TARGETS ${PROJECT_NAME} DESTINATION ${RS_BIN_INSTALL_DIR})

1843
retroshare-gui/src/CMakeLists.txt
View File

File diff suppressed because it is too large Load Diff

2
retroshare-gui/src/gui/statistics/BandwidthStatsWidget.h
View File

@ -18,6 +18,8 @@
* *
*******************************************************************************/
#pragma once
#include "ui_BandwidthStatsWidget.h"
#include "BWGraph.h"