mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-07-22 23:14:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into merge-master-to-taglib2

Browse Source 
# Conflicts:
#	ConfigureChecks.cmake
#	taglib/CMakeLists.txt
#	taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp
#	taglib/toolkit/tfilestream.cpp
This commit is contained in:
Tsuda Kageyu
2017-06-09 11:11:44 +09:00
parent bd4a45b07e 662f340f93
commit 10e8866fec
14 changed files with 215 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ConfigureChecks.cmake
View File

@ -249,3 +249,8 @@ if(BUILD_TESTS AND NOT BUILD_SHARED_LIBS)
set(BUILD_TESTS OFF)
endif()
endif()
# Detect WinRT mode
if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
set(PLATFORM WINRT 1)
endif()