diff --git a/CMakeLists.txt b/CMakeLists.txt index 74128336..b5d5c72d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,6 +82,7 @@ endif() # ================================================================================== set(QV2RAY_QNODEEDITOR_PROVIDER "module" CACHE STRING "qnodeeditor 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_VCORE_PATH "unset" CACHE STRING "v2ray core path") set(QV2RAY_TRANSLATION_PATH "unset" CACHE STRING "Qv2ray translations path") @@ -222,6 +223,7 @@ target_link_libraries(qv2ray-baselib target_link_libraries(qv2ray qv2ray-baselib ${QNODEEDITOR_LIBRARY} + ${SINGLEAPPLICATION_LIBRARY} ) target_include_directories(qv2ray PUBLIC diff --git a/cmake/qnodeeditor.cmake b/cmake/qnodeeditor.cmake index dd5f3a25..a4550f9d 100644 --- a/cmake/qnodeeditor.cmake +++ b/cmake/qnodeeditor.cmake @@ -81,5 +81,6 @@ if(QV2RAY_QNODEEDITOR_PROVIDER STREQUAL "module") set(QNODEEDITOR_QRC_RESOURCES ${QNODEEDITOR_DIR}/resources/resources.qrc) elseif(QV2RAY_QNODEEDITOR_PROVIDER STREQUAL "package") find_package(NodeEditor REQUIRED CONFIG) + find_path(QNODEEDITOR_INCLUDE_PATH NAMES Node.hpp PATH_SUFFIXES nodes/internal) set(QNODEEDITOR_LIBRARY NodeEditor::nodes) endif() diff --git a/cmake/singleapplication.cmake b/cmake/singleapplication.cmake index 1f91b21b..04173135 100644 --- a/cmake/singleapplication.cmake +++ b/cmake/singleapplication.cmake @@ -1,6 +1,11 @@ add_definitions(-DQAPPLICATION_CLASS=QApplication) -set(SINGLEAPPLICATION_DIR ${CMAKE_SOURCE_DIR}/3rdparty/SingleApplication) -set(SINGLEAPPLICATION_SOURCES - ${SINGLEAPPLICATION_DIR}/singleapplication.cpp - ${SINGLEAPPLICATION_DIR}/singleapplication_p.cpp -) \ No newline at end of file +if(QV2RAY_SINGLEAPPLICATION_PROVIDER STREQUAL "module") + set(SINGLEAPPLICATION_DIR ${CMAKE_SOURCE_DIR}/3rdparty/SingleApplication) + set(SINGLEAPPLICATION_SOURCES + ${SINGLEAPPLICATION_DIR}/singleapplication.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() \ No newline at end of file diff --git a/makespec/BUILDVERSION b/makespec/BUILDVERSION index a638f282..1a97831d 100644 --- a/makespec/BUILDVERSION +++ b/makespec/BUILDVERSION @@ -1 +1 @@ -5547 +5548