Fix OpenBSD build.

#666
This commit is contained in:
Craig Drummond
2015-04-26 16:04:44 +01:00
parent 164c617b35
commit 3b2e6dddeb
2 changed files with 8 additions and 3 deletions

View File

@@ -5,6 +5,10 @@ PROJECT(cantata)
set(PROJECT_URL "cantata.mpd")
set(PROJECT_REV_URL "mpd.cantata")
if (CMAKE_SYSTEM_NAME MATCHES "kOpenBSD.*|OpenBSD.*")
set(OPENBSD TRUE)
endif (CMAKE_SYSTEM_NAME MATCHES "kOpenBSD.*|OpenBSD.*")
if (WIN32)
# For some reason I chose mpd as the organization name for Windows builds. So, for config compatability, this is
# left as mpd for now...
@@ -582,10 +586,10 @@ if (TAGLIB_FOUND)
# Cantata still links to taglib, even if external tag reader/writer is used, because JamendoService uses taglib for ID3 genres.
set(CANTATA_LIBS ${CANTATA_LIBS} ${TAGLIB_LIBRARIES})
include_directories(${TAGLIB_INCLUDES})
if (APPLE)
# for some reason under osx we get full path ino include/taglib?
if (APPLE OR OPENBSD)
# for some reason under osx we get full path no include/taglib?
include_directories(${TAGLIB_INCLUDES}/..)
endif (APPLE)
endif (APPLE OR OPENBSD)
if (NOT ENABLE_EXTERNAL_TAGS AND TAGLIB-EXTRAS_FOUND)
set(CANTATA_LIBS ${CANTATA_LIBS} ${TAGLIB-EXTRAS_LIBRARIES})
include_directories(${TAGLIB-EXTRAS_INCLUDES})

View File

@@ -50,6 +50,7 @@
32. Resolve TuneIn radio URL's before adding to favourites (if added via TuneIn
search).
33. Use mpd.cantata for DBus service names and not com.googlecode.cantata
34. Fix OpenBSD build.
1.5.2
-----