github/Qv2ray
5
0
Fork 0
mirror of https://github.com/Qv2ray/Qv2ray.git synced 2025-05-20 19:00:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

update cmake/singleapplication.cmake for supporting system singleapplication

Browse Source 
fix: qnodeeditor headers not found when using system package
This commit is contained in:
ymshenyu 2020-06-05 12:01:40 +08:00
parent 98ff25d148
commit 7fde59368d
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -82,6 +82,7 @@ endif()
# ================================================================================== # ==================================================================================
set(QV2RAY_QNODEEDITOR_PROVIDER "module" CACHE STRING "qnodeeditor provider") set(QV2RAY_QNODEEDITOR_PROVIDER "module" CACHE STRING "qnodeeditor provider")
set(QV2RAY_ZXING_PROVIDER "module" CACHE STRING "zxing-cpp provider") set(QV2RAY_ZXING_PROVIDER "module" CACHE STRING "zxing-cpp provider")
set(QV2RAY_SINGLEAPPLICATION_PROVIDER "module" CACHE STRING "SingleApplication provider")
set(QV2RAY_DEFAULT_VASSETS_PATH "unset" CACHE STRING "v2ray assets path") set(QV2RAY_DEFAULT_VASSETS_PATH "unset" CACHE STRING "v2ray assets path")
set(QV2RAY_DEFAULT_VCORE_PATH "unset" CACHE STRING "v2ray core path") set(QV2RAY_DEFAULT_VCORE_PATH "unset" CACHE STRING "v2ray core path")
set(QV2RAY_TRANSLATION_PATH "unset" CACHE STRING "Qv2ray translations path") set(QV2RAY_TRANSLATION_PATH "unset" CACHE STRING "Qv2ray translations path")
@ -222,6 +223,7 @@ target_link_libraries(qv2ray-baselib
target_link_libraries(qv2ray target_link_libraries(qv2ray
qv2ray-baselib qv2ray-baselib
${QNODEEDITOR_LIBRARY} ${QNODEEDITOR_LIBRARY}
${SINGLEAPPLICATION_LIBRARY}
) )
target_include_directories(qv2ray PUBLIC target_include_directories(qv2ray PUBLIC

1
cmake/qnodeeditor.cmake
View File

@ -81,5 +81,6 @@ if(QV2RAY_QNODEEDITOR_PROVIDER STREQUAL "module")
set(QNODEEDITOR_QRC_RESOURCES ${QNODEEDITOR_DIR}/resources/resources.qrc) set(QNODEEDITOR_QRC_RESOURCES ${QNODEEDITOR_DIR}/resources/resources.qrc)
elseif(QV2RAY_QNODEEDITOR_PROVIDER STREQUAL "package") elseif(QV2RAY_QNODEEDITOR_PROVIDER STREQUAL "package")
find_package(NodeEditor REQUIRED CONFIG) find_package(NodeEditor REQUIRED CONFIG)
find_path(QNODEEDITOR_INCLUDE_PATH NAMES Node.hpp PATH_SUFFIXES nodes/internal)
set(QNODEEDITOR_LIBRARY NodeEditor::nodes) set(QNODEEDITOR_LIBRARY NodeEditor::nodes)
endif() endif()

5
cmake/singleapplication.cmake
View File

@ -1,6 +1,11 @@
add_definitions(-DQAPPLICATION_CLASS=QApplication) add_definitions(-DQAPPLICATION_CLASS=QApplication)
if(QV2RAY_SINGLEAPPLICATION_PROVIDER STREQUAL "module")
set(SINGLEAPPLICATION_DIR ${CMAKE_SOURCE_DIR}/3rdparty/SingleApplication) set(SINGLEAPPLICATION_DIR ${CMAKE_SOURCE_DIR}/3rdparty/SingleApplication)
set(SINGLEAPPLICATION_SOURCES set(SINGLEAPPLICATION_SOURCES
${SINGLEAPPLICATION_DIR}/singleapplication.cpp ${SINGLEAPPLICATION_DIR}/singleapplication.cpp
${SINGLEAPPLICATION_DIR}/singleapplication_p.cpp ${SINGLEAPPLICATION_DIR}/singleapplication_p.cpp
) )
elseif(QV2RAY_SINGLEAPPLICATION_PROVIDER STREQUAL "package")
find_library(SINGLEAPPLICATION_LIBRARY NAMES SingleApplication)
find_path(SINGLEAPPLICATION_DIR NAMES singleapplication.h PATH_SUFFIXES singleapplication)
endif()

2
makespec/BUILDVERSION
View File

@ -1 +1 @@
5547 5548