dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix use system SingleApplication

Browse Source
This commit is contained in:
Jonas Kvinge
2019-01-12 02:07:39 +01:00
parent 494ab68dd2
commit a4120d3d3e
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@@ -187,10 +187,6 @@ if (TAGLIB_FOUND AND USE_SYSTEM_TAGLIB)
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!")
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)
if(HAVE_TAGLIB_DSFFILE_H)
set(HAVE_TAGLIB_DSFFILE ON)
@@ -206,8 +202,8 @@ else()
endif()
# SingleApplication
find_library(SINGLEAPPLICATION singleapplication)
find_library(SINGLECOREAPPLICATION singlecoreapplication)
pkg_check_modules(SINGLEAPPLICATION singleapplication)
pkg_check_modules(SINGLECOREAPPLICATION singlecoreapplication)
if (SINGLEAPPLICATION_FOUND AND SINGLECOREAPPLICATION_FOUND)
option(USE_SYSTEM_SINGLEAPPLICATION "Use system SingleApplication/SingleCoreApplication libraries" ON)
else(SINGLEAPPLICATION_FOUND AND SINGLECOREAPPLICATION_FOUND)