Fix use system SingleApplication
This commit is contained in:
parent
494ab68dd2
commit
a4120d3d3e
|
@ -7,7 +7,6 @@ QT5_WRAP_CPP(SINGLEAPP-SOURCES-MOC ${SINGLEAPP-MOC-HEADERS})
|
||||||
ADD_LIBRARY(singleapplication STATIC ${SINGLEAPP-SOURCES} ${SINGLEAPP-SOURCES-MOC})
|
ADD_LIBRARY(singleapplication STATIC ${SINGLEAPP-SOURCES} ${SINGLEAPP-SOURCES-MOC})
|
||||||
target_link_libraries(singleapplication Qt5::Core Qt5::Widgets Qt5::Network)
|
target_link_libraries(singleapplication Qt5::Core Qt5::Widgets Qt5::Network)
|
||||||
|
|
||||||
|
|
||||||
set(SINGLECOREAPP-SOURCES singlecoreapplication.cpp singlecoreapplication_p.cpp)
|
set(SINGLECOREAPP-SOURCES singlecoreapplication.cpp singlecoreapplication_p.cpp)
|
||||||
set(SINGLECOREAPP-MOC-HEADERS singlecoreapplication.h singlecoreapplication_p.h)
|
set(SINGLECOREAPP-MOC-HEADERS singlecoreapplication.h singlecoreapplication_p.h)
|
||||||
QT5_WRAP_CPP(SINGLECOREAPP-SOURCES-MOC ${SINGLECOREAPP-MOC-HEADERS})
|
QT5_WRAP_CPP(SINGLECOREAPP-SOURCES-MOC ${SINGLECOREAPP-MOC-HEADERS})
|
||||||
|
|
|
@ -187,10 +187,6 @@ if (TAGLIB_FOUND AND USE_SYSTEM_TAGLIB)
|
||||||
else()
|
else()
|
||||||
message(WARNING "Using system taglib library. Version 1.11.1 or less has a bug corrupting Ogg files, make sure your systems version has been patched!")
|
message(WARNING "Using system taglib library. Version 1.11.1 or less has a bug corrupting Ogg files, make sure your systems version has been patched!")
|
||||||
endif()
|
endif()
|
||||||
set(CMAKE_REQUIRED_INCLUDES "${TAGLIB_INCLUDE_DIRS}")
|
|
||||||
set(CMAKE_REQUIRED_LIBRARIES "${TAGLIB_LIBRARIES}")
|
|
||||||
set(CMAKE_REQUIRED_INCLUDES)
|
|
||||||
set(CMAKE_REQUIRED_LIBRARIES)
|
|
||||||
find_path(HAVE_TAGLIB_DSFFILE_H taglib/dsffile.h)
|
find_path(HAVE_TAGLIB_DSFFILE_H taglib/dsffile.h)
|
||||||
if(HAVE_TAGLIB_DSFFILE_H)
|
if(HAVE_TAGLIB_DSFFILE_H)
|
||||||
set(HAVE_TAGLIB_DSFFILE ON)
|
set(HAVE_TAGLIB_DSFFILE ON)
|
||||||
|
@ -206,8 +202,8 @@ else()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# SingleApplication
|
# SingleApplication
|
||||||
find_library(SINGLEAPPLICATION singleapplication)
|
pkg_check_modules(SINGLEAPPLICATION singleapplication)
|
||||||
find_library(SINGLECOREAPPLICATION singlecoreapplication)
|
pkg_check_modules(SINGLECOREAPPLICATION singlecoreapplication)
|
||||||
if (SINGLEAPPLICATION_FOUND AND SINGLECOREAPPLICATION_FOUND)
|
if (SINGLEAPPLICATION_FOUND AND SINGLECOREAPPLICATION_FOUND)
|
||||||
option(USE_SYSTEM_SINGLEAPPLICATION "Use system SingleApplication/SingleCoreApplication libraries" ON)
|
option(USE_SYSTEM_SINGLEAPPLICATION "Use system SingleApplication/SingleCoreApplication libraries" ON)
|
||||||
else(SINGLEAPPLICATION_FOUND AND SINGLECOREAPPLICATION_FOUND)
|
else(SINGLEAPPLICATION_FOUND AND SINGLECOREAPPLICATION_FOUND)
|
||||||
|
|
|
@ -71,6 +71,8 @@ endif()
|
||||||
link_directories(${TAGLIB_LIBRARY_DIRS})
|
link_directories(${TAGLIB_LIBRARY_DIRS})
|
||||||
include_directories(${TAGLIB_INCLUDE_DIRS})
|
include_directories(${TAGLIB_INCLUDE_DIRS})
|
||||||
|
|
||||||
|
link_directories(${SINGLEAPPLICATION_LIBRARY_DIRS})
|
||||||
|
link_directories(${SINGLECOREAPPLICATION_LIBRARY_DIRS})
|
||||||
include_directories(${SINGLEAPPLICATION_INCLUDE_DIRS})
|
include_directories(${SINGLEAPPLICATION_INCLUDE_DIRS})
|
||||||
include_directories(${SINGLECOREAPPLICATION_INCLUDE_DIRS})
|
include_directories(${SINGLECOREAPPLICATION_INCLUDE_DIRS})
|
||||||
|
|
||||||
|
@ -1029,8 +1031,9 @@ if (UNIX AND NOT APPLE)
|
||||||
endif ()
|
endif ()
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
add_dependencies(strawberry_lib singleapplication singlecoreapplication)
|
if(NOT USE_SYSTEM_SINGLEAPPLICATION)
|
||||||
|
add_dependencies(strawberry_lib ${SINGLEAPPLICATION_LIBRARIES} ${SINGLECOREAPPLICATION_LIBRARIES})
|
||||||
|
endif()
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue