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

fixed some bugs

Browse Source
This commit is contained in:
csoler 2022-03-25 22:05:28 +01:00
parent 40336c2337
commit bf1b3ed69a
1 changed files with 16 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
retroshare-gui/CMakeLists.txt
View File

@ -80,7 +80,7 @@ endif(RS_DEVELOPMENT_BUILD)
include(src/CMakeLists.txt) include(src/CMakeLists.txt)
add_executable(${PROJECT_NAME} ${RS_SERVICE_SOURCES}) add_executable(${PROJECT_NAME} ${RS_SOURCES} ${RS_FORMS} ${RS_QTRESOURCES})
install(TARGETS ${PROJECT_NAME} DESTINATION ${RS_BIN_INSTALL_DIR}) install(TARGETS ${PROJECT_NAME} DESTINATION ${RS_BIN_INSTALL_DIR})
@ -92,27 +92,25 @@ endif(RS_DEVELOPMENT_BUILD)
################################################################################ ################################################################################
set(RETROSHAREGUI_DEVEL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../retroshare-gui/") set(LIBRETROSHARE_DEVEL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../libretroshare/")
if(EXISTS "${RETROSHAREGUI_DEVEL_DIR}/.git" ) if(EXISTS "${LIBRETROSHARE_DEVEL_DIR}/.git" )
message( message(
STATUS STATUS
"retroshare-gui submodule found at ${RETROSHAREGUI_DEVEL_DIR} using it" ) "libretroshare submodule found at ${LIBRETROSHARE_DEVEL_DIR} using it" )
add_subdirectory( add_subdirectory(
"${RETROSHAREGUI_DEVEL_DIR}" "${CMAKE_BINARY_DIR}/retroshare-gui" ) "${LIBRETROSHARE_DEVEL_DIR}" "${CMAKE_BINARY_DIR}/libretroshare" )
else() else()
FetchContent_Declare( FetchContent_Declare(
retroshare-gui libretroshare
GIT_REPOSITORY "https://gitlab.com/RetroShare/retroshare.git" GIT_REPOSITORY "https://gitlab.com/RetroShare/libretroshare.git"
GIT_TAG "origin/master" GIT_TAG "origin/master"
GIT_SHALLOW TRUE GIT_SHALLOW TRUE
GIT_PROGRESS TRUE GIT_PROGRESS TRUE
TIMEOUT 10 TIMEOUT 10
) )
FetchContent_MakeAvailable(retroshare-gui) FetchContent_MakeAvailable(libretroshare)
endif() endif()
target_link_libraries(${PROJECT_NAME} PRIVATE retroshare)
################################################################################ ################################################################################
if(RS_SERVICE_DESKTOP) if(RS_SERVICE_DESKTOP)
@ -237,11 +235,12 @@ if(UNIX)
pkg_check_modules(X11 REQUIRED x11) pkg_check_modules(X11 REQUIRED x11)
pkg_check_modules(XSCRNSAVER REQUIRED xscrnsaver) pkg_check_modules(XSCRNSAVER REQUIRED xscrnsaver)
target_link_libraries(${PROJECT_NAME} PRIVATE ${X11_LIBRARIES}) list( APPEND RS_LINK_LIBRARIES ${X11_LIBRARIES} )
list( APPEND RS_LINK_LIBRARIES ${XSCRNSAVER_LIBRARIES} )
target_include_directories(${PROJECT_NAME} PRIVATE ${X11_INCLUDE_DIRS}) target_include_directories(${PROJECT_NAME} PRIVATE ${X11_INCLUDE_DIRS})
target_compile_options(${PROJECT_NAME} PRIVATE ${X11_CFLAGS_OTHER}) target_compile_options(${PROJECT_NAME} PRIVATE ${X11_CFLAGS_OTHER})
target_link_libraries(${PROJECT_NAME} ${XSCRNSAVER_LIBRARIES})
target_include_directories(retroshare-gui PRIVATE ${XSCRNSAVER_INCLUDE_DIRS}) target_include_directories(retroshare-gui PRIVATE ${XSCRNSAVER_INCLUDE_DIRS})
target_compile_options(retroshare-gui PRIVATE ${XSCRNSAVER_CFLAGS_OTHER}) target_compile_options(retroshare-gui PRIVATE ${XSCRNSAVER_CFLAGS_OTHER})
@ -251,8 +250,8 @@ if(UNIX)
endif(UNIX) endif(UNIX)
if(RS_SANITIZE) if(RS_SANITIZE)
target_link_libraries(${PROJECT_NAME} asan) list( APPEND RS_LINK_LIBRARIES asan )
target_link_libraries(${PROJECT_NAME} ubsan) list( APPEND RS_LINK_LIBRARIES ubsan )
endif(RS_SANITIZE) endif(RS_SANITIZE)
# #################### Cross compilation for windows under Linux ################### # #################### Cross compilation for windows under Linux ###################
@ -428,25 +427,6 @@ endif(RS_SANITIZE)
# LIBS *= -lglib-2.0 # LIBS *= -lglib-2.0
# } # }
set(LIBRETROSHARE_DEVEL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../libretroshare/")
if(EXISTS "${LIBRETROSHARE_DEVEL_DIR}/.git" )
message(
STATUS
"libretroshare submodule found at ${LIBRETROSHARE_DEVEL_DIR} using it" )
add_subdirectory(
"${LIBRETROSHARE_DEVEL_DIR}" "${CMAKE_BINARY_DIR}/libretroshare" )
else()
FetchContent_Declare(
libretroshare
GIT_REPOSITORY "https://gitlab.com/RetroShare/libretroshare.git"
GIT_TAG "origin/master"
GIT_SHALLOW TRUE
GIT_PROGRESS TRUE
TIMEOUT 10
)
FetchContent_MakeAvailable(libretroshare)
endif()
################################ QT FILES ####################################### ################################ QT FILES #######################################
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11)
@ -458,13 +438,12 @@ set(CMAKE_AUTOUIC ON)
find_package( Qt5 COMPONENTS Widgets REQUIRED) find_package( Qt5 COMPONENTS Widgets REQUIRED)
target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Widgets) list( APPEND RS_LINK_LIBRARIES Qt5::Widget )
################################ GENERAL ####################################### ################################ GENERAL #######################################
target_link_libraries(${PROJECT_NAME} PRIVATE retroshare) target_link_libraries(${PROJECT_NAME} PRIVATE ${RS_LINK_LIBRARIES})
add_dependencies(${PROJECT_NAME} libretroshare) add_dependencies(${PROJECT_NAME} libretroshare)
add_executable(${PROJECT_NAME} ${RS_SOURCES} ${RS_FORMS} ${RS_QTRESOURCES})
install(TARGETS ${PROJECT_NAME} DESTINATION ${RS_BIN_INSTALL_DIR}) install(TARGETS ${PROJECT_NAME} DESTINATION ${RS_BIN_INSTALL_DIR})