mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-05-27 21:20:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed shlwapi.h and shlwapi.lib detection for MSVC

Browse Source
This commit is contained in:
Tsuda Kageyu 2013-05-26 04:17:18 +09:00
parent e7c0f3322d
commit 42d268c2c9
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ConfigureChecks.cmake
View File

@ -219,7 +219,7 @@ endif()
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
if(WIN32)
if(WIN32 AND NOT MSVC)
find_package(SHLWAPI)
if(SHLWAPI_FOUND)
set(HAVE_SHLWAPI 1)

10
taglib/CMakeLists.txt
View File

@ -30,7 +30,7 @@ if(ZLIB_FOUND)
include_directories(${ZLIB_INCLUDE_DIR})
endif()
if(SHLWAPI_FOUND)
if(NOT MSVC AND SHLWAPI_FOUND)
include_directories(${SHLWAPI_INCLUDE_DIR})
endif()
@ -315,8 +315,12 @@ if(ZLIB_FOUND)
target_link_libraries(tag ${ZLIB_LIBRARIES})
endif()
if(SHLWAPI_FOUND)
target_link_libraries(tag ${SHLWAPI_LIBRARIES})
if(MSVC)
target_link_libraries(tag shlwapi.lib)
else()
if(SHLWAPI_FOUND)
target_link_libraries(tag ${SHLWAPI_LIBRARIES})
endif()
endif()
set_target_properties(tag PROPERTIES