Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
mirror of https://github.com/strawberrymusicplayer/strawberry synced 2025-01-15 18:30:39 +01:00
Code Issues Releases Wiki Activity

Fix taglib in makefile

Browse Source
This commit is contained in:
Jonas Kvinge 2018-05-10 17:08:55 +02:00
parent 28b670c2dc
commit bcc60797c6
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
3rdparty/taglib/CMakeLists.txt vendored
View File

@ -368,15 +368,15 @@ set_target_properties(tag PROPERTIES
LINK_INTERFACE_LIBRARIES "" LINK_INTERFACE_LIBRARIES ""
#PUBLIC_HEADER "${tag_HDRS}" #PUBLIC_HEADER "${tag_HDRS}"
) )
if(BUILD_FRAMEWORK) #if(BUILD_FRAMEWORK)
unset(INSTALL_NAME_DIR) # unset(INSTALL_NAME_DIR)
set_target_properties(tag PROPERTIES # set_target_properties(tag PROPERTIES
FRAMEWORK TRUE # FRAMEWORK TRUE
MACOSX_RPATH 1 # MACOSX_RPATH 1
VERSION "A" # VERSION "A"
SOVERSION "A" # SOVERSION "A"
) # )
endif() #endif()
#install(TARGETS tag #install(TARGETS tag
# FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR} # FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR}

2
CMakeLists.txt
View File

@ -123,7 +123,7 @@ if (TAGLIB_VERSION VERSION_GREATER 1.11.1 OR WIN32)
else() else()
option(USE_SYSTEM_TAGLIB "Use system taglib" OFF) option(USE_SYSTEM_TAGLIB "Use system taglib" OFF)
endif() endif()
if (USE_SYSTEM_TAGLIB) if (TAGLIB_FOUND AND USE_SYSTEM_TAGLIB)
message(STATUS "Using system taglib library") message(STATUS "Using system taglib library")
set(CMAKE_REQUIRED_INCLUDES "${TAGLIB_INCLUDE_DIRS}") set(CMAKE_REQUIRED_INCLUDES "${TAGLIB_INCLUDE_DIRS}")
set(CMAKE_REQUIRED_LIBRARIES "${TAGLIB_LIBRARIES}") set(CMAKE_REQUIRED_LIBRARIES "${TAGLIB_LIBRARIES}")